Feature/level 0 fixes

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

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"]
+                }
+            }
         }
     }
 }

phpdoc_result_script.sh

@@ -0,0 +1,8 @@
+#bin/bash
+
+for level in {0..9}
+do
+    docker exec my_eccube-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,2 +1,9 @@
 parameters:
-  level: 1
+  level: 0
+  doctrine:
+    objectManagerLoader: tests/object-manager.php
+    ormRepositoryClass: Eccube\Repository\AbstractRepository
+  errorFormat: json
+services:
+  errorFormatter.csv:
+    class: Eccube\Service\Command\CsvErrorFormatter

src/Eccube/Entity/AuthorityRole.php

@@ -58,7 +58,7 @@ class AuthorityRole extends \Eccube\Entity\AbstractEntity
         private $update_date;
 
         /**
-         * @var \Eccube\Entity\Master\Authority
+         * @var \Eccube\Entity\Master\Authority|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Authority")
          * @ORM\JoinColumns({
@@ -68,7 +68,7 @@ class AuthorityRole extends \Eccube\Entity\AbstractEntity
         private $Authority;
 
         /**
-         * @var \Eccube\Entity\Member
+         * @var \Eccube\Entity\Member|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Member")
          * @ORM\JoinColumns({

src/Eccube/Entity/BaseInfo.php

@@ -257,21 +257,21 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity
         private $option_point = true;
 
         /**
-         * @var string
+         * @var string|null
          *
          * @ORM\Column(name="basic_point_rate", type="decimal", precision=10, scale=0, options={"unsigned":true, "default":1}, nullable=true)
          */
         private $basic_point_rate = '1';
 
         /**
-         * @var string
+         * @var string|null
          *
          * @ORM\Column(name="point_conversion_rate", type="decimal", precision=10, scale=0, options={"unsigned":true, "default":1}, nullable=true)
          */
         private $point_conversion_rate = '1';
 
         /**
-         * @var \Eccube\Entity\Master\Country
+         * @var \Eccube\Entity\Master\Country|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Country")
          * @ORM\JoinColumns({
@@ -282,7 +282,7 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity
         private $Country;
 
         /**
-         * @var \Eccube\Entity\Master\Pref
+         * @var \Eccube\Entity\Master\Pref|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\Pref")
          * @ORM\JoinColumns({
@@ -1074,7 +1074,7 @@ public function isOptionPoint()
         /**
          * Set pointConversionRate
          *
-         * @param string $pointConversionRate
+         * @param string|null $pointConversionRate
          *
          * @return BaseInfo
          */
@@ -1088,7 +1088,7 @@ public function setPointConversionRate($pointConversionRate)
         /**
          * Get pointConversionRate
          *
-         * @return string
+         * @return string|null
          */
         public function getPointConversionRate()
         {
@@ -1098,7 +1098,7 @@ public function getPointConversionRate()
         /**
          * Set basicPointRate
          *
-         * @param string $basicPointRate
+         * @param string|null $basicPointRate
          *
          * @return BaseInfo
          */
@@ -1112,7 +1112,7 @@ public function setBasicPointRate($basicPointRate)
         /**
          * Get basicPointRate
          *
-         * @return string
+         * @return string|null
          */
         public function getBasicPointRate()
         {

src/Eccube/Entity/Block.php

@@ -84,14 +84,14 @@ class Block extends \Eccube\Entity\AbstractEntity
         private $update_date;
 
         /**
-         * @var \Doctrine\Common\Collections\Collection
+         * @var \Doctrine\Common\Collections\Collection<int,BlockPosition>
          *
          * @ORM\OneToMany(targetEntity="Eccube\Entity\BlockPosition", mappedBy="Block", cascade={"persist","remove"})
          */
         private $BlockPositions;
 
         /**
-         * @var \Eccube\Entity\Master\DeviceType
+         * @var \Eccube\Entity\Master\DeviceType|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Master\DeviceType")
          * @ORM\JoinColumns({
@@ -294,6 +294,8 @@ public function addBlockPosition(BlockPosition $blockPosition)
          * Remove blockPosition
          *
          * @param \Eccube\Entity\BlockPosition $blockPosition
+         *
+         * @return void
          */
         public function removeBlockPosition(BlockPosition $blockPosition)
         {
@@ -303,7 +305,7 @@ public function removeBlockPosition(BlockPosition $blockPosition)
         /**
          * Get blockPositions
          *
-         * @return \Doctrine\Common\Collections\Collection
+         * @return \Doctrine\Common\Collections\Collection<int,BlockPosition>
          */
         public function getBlockPositions()
         {
@@ -313,7 +315,7 @@ public function getBlockPositions()
         /**
          * Set deviceType
          *
-         * @param \Eccube\Entity\Master\DeviceType $deviceType
+         * @param \Eccube\Entity\Master\DeviceType|null $deviceType
          *
          * @return Block
          */
@@ -327,7 +329,7 @@ public function setDeviceType(Master\DeviceType $deviceType = null)
         /**
          * Get deviceType
          *
-         * @return \Eccube\Entity\Master\DeviceType
+         * @return \Eccube\Entity\Master\DeviceType|null
          */
         public function getDeviceType()
         {

src/Eccube/Entity/BlockPosition.php

@@ -62,7 +62,7 @@ class BlockPosition extends \Eccube\Entity\AbstractEntity
         private $block_row;
 
         /**
-         * @var \Eccube\Entity\Block
+         * @var \Eccube\Entity\Block|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Block", inversedBy="BlockPositions")
          * @ORM\JoinColumns({
@@ -72,7 +72,7 @@ class BlockPosition extends \Eccube\Entity\AbstractEntity
         private $Block;
 
         /**
-         * @var \Eccube\Entity\Layout
+         * @var \Eccube\Entity\Layout|null
          *
          * @ORM\ManyToOne(targetEntity="Eccube\Entity\Layout", inversedBy="BlockPositions")
          * @ORM\JoinColumns({

src/Eccube/Entity/Calendar.php

@@ -52,7 +52,7 @@ public function isDefaultCalendar()
         private $id;
 
         /**
-         * @var string
+         * @var string|null
          *
          * @ORM\Column(name="title", type="string", length=255, nullable=true)
          */
@@ -92,7 +92,7 @@ public function getId()
         /**
          * Set title.
          *
-         * @param string $title
+         * @param string|null $title
          *
          * @return Calendar
          */
@@ -106,7 +106,7 @@ public function setTitle($title)
         /**
          * Get title.
          *
-         * @return string
+         * @return string|null
          */
         public function getTitle()
         {