Feature/phpstan level3 bugfixes

.env.dist

@@ -5,8 +5,8 @@
 ###> symfony/framework-bundle ###
 # For production servers, use: "APP_ENV=prod" and "APP_DEBUG=0"
 # For local development, use: "APP_ENV=dev" and "APP_DEBUG=1"
-APP_ENV=prod
-APP_DEBUG=0
+APP_ENV=dev
+APP_DEBUG=1
 #TRUSTED_PROXIES=127.0.0.1,127.0.0.2
 #TRUSTED_HOSTS=^localhost$,^example\.com$
 ###< symfony/framework-bundle ###
@@ -15,8 +15,8 @@ APP_DEBUG=0
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls
-DATABASE_URL=sqlite:///var/eccube.db
-# DATABASE_URL=mysql://dbuser:secret@mysql/eccubedb
+# DATABASE_URL=sqlite:///var/eccube.db
+DATABASE_URL=mysql://dbuser:secret@mysql/eccubedb
 # DATABASE_URL=postgresql://postgres/eccubedb?user=dbuser&password=secret
 
 # The version of your database engine

Dockerfile

@@ -1,4 +1,4 @@
-ARG TAG=7.4-apache-bullseye
+ARG TAG=8.1-apache-bullseye
 FROM php:${TAG}
 
 ENV APACHE_DOCUMENT_ROOT /var/www/html
@@ -32,10 +32,13 @@ RUN apt update \
   && echo "en_US.UTF-8 UTF-8" >/etc/locale.gen \
   && locale-gen \
   ;
+RUN pecl search xdebug-3.1.6\
+    && pecl install xdebug-3.1.6
 
 RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
   && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
   && docker-php-ext-install -j$(nproc) zip gd mysqli pdo_mysql opcache intl pgsql pdo_pgsql \
+#  && docker-php-ext-enable xdebug \
   ;
 
 RUN pecl install apcu && echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apc.ini
@@ -73,10 +76,10 @@ RUN composer config -g repos.packagist composer https://packagist.jp
 COPY . ${APACHE_DOCUMENT_ROOT}
 WORKDIR ${APACHE_DOCUMENT_ROOT}
 
-RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or -print0 \
-  | xargs -0 chown www-data:www-data \
-  && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \
-  | xargs -0 chmod g+s \
-  ;
+#RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or -print0 \
+#  | xargs -0 chown www-data:www-data \
+#  && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \
+#  | xargs -0 chmod g+s \
+#  ;
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=30 CMD pgrep apache

app/config/eccube/packages/doctrine.yaml

@@ -25,6 +25,7 @@ doctrine:
         types:
             datetime: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeType'
             datetimetz: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeTzType'
+        default_connection: 'default'
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

codeception/docker/docker-php-entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+while ! nc -z ec-cube 80; do sleep 1; done; while ! nc -z chrome 4444; do sleep 1; done; ls -la && php bin/console cache:clear --no-warmup && /var/www/html/vendor/bin/codecept run -d acceptance --env chrome-headless,local -g customer
+

composer.json

@@ -12,7 +12,7 @@
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-curl": "*",
         "ext-intl": "*",
         "ext-json": "*",
@@ -115,7 +115,9 @@
         "dama/doctrine-test-bundle": "^6.6",
         "fakerphp/faker": "^1.16",
         "mikey179/vfsstream": "^1.6",
+        "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.7",
+        "phpstan/phpstan-doctrine": "^1.3",
         "symfony/browser-kit": "^5.4",
         "symfony/phpunit-bridge": "^5.4"
     },
@@ -186,7 +188,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4.0"
+            "php": "8.1.18"
         },
         "preferred-install": {
             "*": "dist"
@@ -197,7 +199,19 @@
             "composer/*": true,
             "kylekatarnls/update-helper": true,
             "ec-cube/plugin-installer": true,
-            "symfony/flex": true
+            "symfony/flex": true,
+            "phpstan/extension-installer": true
+        }
+    },
+    "repositories": {
+        "eccube": {
+            "type": "composer",
+            "url": "https://package-api-c2.ec-cube.net/v42",
+            "options": {
+                "http": {
+                    "header": ["X-ECCUBE-KEY: d285840e84bb5ab7c5650250818a75970877c761"]
+                }
+            }
         }
     }
 }

docker-compose.yml

@@ -22,15 +22,16 @@ services:
     ### ローカルでビルドする場合は以下のコマンドを使用します
     ## docker build -t ec-cube --no-cache --pull --build-arg TAG=8.1-apache .
     ## docker tag ec-cube ghcr.io/ec-cube/ec-cube-php:8.1-apache
-    image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache}
+    # image: ${REGISTRY:-ghcr.io}/${IMAGE_NAME:-ec-cube/ec-cube-php}:${TAG:-8.1-apache}
+    build:
+      context: .
     ports:
       - 8080:80
       - 4430:443
     volumes:
       ### 同期対象からコストの重いフォルダを除外 #####################
-      - "var:/var/www/html/var"
-      - "vendor:/var/www/html/vendor"
-      - "node_modules:/var/www/html/node_modules"
+      - ".:/var/www/html"
+      # - "./var/coverage:/opt/coverage"
     environment:
       # EC-CUBE environments
       APP_ENV: "dev"
@@ -57,6 +58,8 @@ services:
       # ECCUBE_ADMIN_PASS: "password"
     networks:
       - backend
+    extra_hosts:
+      - host.docker.internal:host-gateway
 
   ### Mailcatcher ##################################
   mailcatcher:

dockerbuild/php.ini

@@ -4,3 +4,9 @@ opcache.memory_consumption=256
 realpath_cache_size = 4096K
 realpath_cache_ttl = 600
 memory_limit = 786M
+
+[xdebug]
+zend_extension=xdebug.so
+xdebug.log =/var/www/html/var/log/xdebug.log
+xdebug.mode=debug
+xdebug.client_host=host.docker.internal

phpdoc_result_script.sh

@@ -0,0 +1,8 @@
+#bin/bash
+
+for level in {0..3}
+do
+    docker exec ec-cube-ec-cube-1 bash -c "vendor/bin/phpstan analyse src --level ${level} > tests/results/level_${level}.json"
+done
+
+php tests/results/convert.php

phpstan.neon.dist

@@ -1,6 +1,11 @@
 parameters:
-  level: 1
+  level: 0
   ignoreErrors:
-    -
-      message: "#^Function twig_include not found\\.$#"
-      path: src/Eccube/Twig/Extension/IgnoreTwigSandboxErrorExtension.php
+    - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
+  excludePaths:
+    - 'var/*'
+    - 'vendor/*'
+  doctrine:
+    objectManagerLoader: tests/object-manager.php
+    ormRepositoryClass: Eccube\Repository\AbstractRepository
+  errorFormat: json

src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php

@@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ]);
             $question = new ConfirmationQuestion($message);
             if (!$this->io->askQuestion($question)) {
-                return;
+                return 0;
             }
         }
 

src/Eccube/Command/GenerateDummyDataCommand.php

@@ -34,7 +34,7 @@ class GenerateDummyDataCommand extends Command
     protected $generator;
 
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $entityManager;
 

src/Eccube/Controller/AbstractController.php

@@ -54,7 +54,7 @@ class AbstractController extends Controller
     protected $eventDispatcher;
 
     /**
-     * @var Session
+     * @var SessionInterface
      */
     protected $session;
 
@@ -174,7 +174,9 @@ public function addRequestErrorOnce($message, $namespace = 'front')
 
     public function clearMessage()
     {
-        $this->session->getFlashBag()->clear();
+        /** @var Session $session */
+        $session = $this->session;
+        $session->getFlashBag()->clear();
     }
 
     public function deleteMessage()
@@ -185,7 +187,9 @@ public function deleteMessage()
 
     public function hasMessage(string $type): bool
     {
-        return $this->session->getFlashBag()->has($type);
+        /** @var Session $session */
+        $session = $this->session;
+        return $session->getFlashBag()->has($type);
     }
 
     public function addFlashOnce(string $type, $message): void
@@ -204,7 +208,9 @@ protected function addFlash(string $type, $message): void
             parent::addFlash($type, $message);
         } catch (\LogicException $e) {
             // fallback session
-            $this->session->getFlashBag()->add($type, $message);
+            /** @var Session $session */
+            $session = $this->session;
+            $session->getFlashBag()->add($type, $message);
         }
     }
 
@@ -214,9 +220,13 @@ protected function addFlash(string $type, $message): void
     public function setLoginTargetPath($targetPath, $namespace = null)
     {
         if (is_null($namespace)) {
-            $this->session->getFlashBag()->set('eccube.login.target.path', $targetPath);
+            /** @var Session $session */
+            $session = $this->session;
+            $session->getFlashBag()->set('eccube.login.target.path', $targetPath);
         } else {
-            $this->session->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
+            /** @var Session $session */
+            $session = $this->session;
+            $session->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
         }
     }