Merge pull request INTER-Mediator#1858 from matsuo/update-composer-js…

…on-for-phpstan Update composer.json for PHPStan and PhpStorm
msyk · Feb 4, 2024 · 54e0853 · 54e0853
2 parents b67e568 + e0e7ce8
commit 54e0853
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/e2e-test-chrome.yml b/.github/workflows/e2e-test-chrome.yml
@@ -38,7 +38,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
 #      - name: Validate composer.json and composer.lock
 #        run: composer validate --strict
@@ -56,7 +56,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/e2e-test-firefox.yml b/.github/workflows/e2e-test-firefox.yml
@@ -39,7 +39,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
 #      - name: Validate composer.json and composer.lock
 #        run: composer validate --strict
@@ -57,7 +57,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -38,7 +38,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       #      - name: Validate composer.json and composer.lock
       #        run: composer validate --strict
@@ -56,7 +56,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ pages:
     - docker exec --privileged -i php73-alpine sh -c "curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && chmod +x /usr/local/bin/composer"
     - docker exec --privileged -i php73-alpine sh -c "apk add --no-cache git bash zip nodejs-npm"
     - docker exec --privileged -i php73-alpine sh -c "ls minify || git clone https://github.com/matthiasmullie/minify"
-    - docker exec --privileged -i php73-alpine sh -c "git clone https://github.com/INTER-Mediator/INTER-Mediator && cd INTER-Mediator && ./dist-docs/buildup.sh --core && cd ../im_build/ && zip -r INTER-Mediator-master.zip ./INTER-Mediator/ && mv INTER-Mediator-master.zip /public/"
+    - docker exec --privileged -i php73-alpine sh -c "git clone https://github.com/INTER-Mediator/INTER-Mediator && cd INTER-Mediator && composer update && ./dist-docs/buildup.sh --core && cd ../im_build/ && zip -r INTER-Mediator-master.zip ./INTER-Mediator/ && mv INTER-Mediator-master.zip /public/"
     - docker exec --privileged -i php73-alpine sh -c "ls -al; ls -al /; ls -al /public/"
     - ls -al
     - ls -al public

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "*",
-    "phpstan/phpstan": "*"
+    "phpstan/phpstan": "@stable"
   },
   "autoload": {
     "psr-4": {
@@ -71,16 +71,19 @@
   "authors": [
     {
       "name": "INTER-Mediator Directive Committee",
-      "homepage": "http://inter-mediator.org/"
+      "homepage": "https://inter-mediator.org/"
     }
   ],
   "support": {
     "community-jp": "https://www.facebook.com/groups/233378356708157/",
     "community-en": "https://www.facebook.com/groups/254446237922985/",
     "source": "https://github.com/INTER-Mediator/INTER-Mediator",
-    "manual": "http://inter-mediator.info/"
+    "manual": "https://inter-mediator.info/"
   },
   "scripts": {
+    "scripts": {
+      "phpstan": "vendor/bin/phpstan -c spec/phpstan.neon"
+    },
     "test": [
       "./vendor/bin/phpunit --bootstrap ./vendor/autoload.php --configuration ./spec/INTER-Mediator-UnitTest/phpunit.xml"
     ],