Merge pull request #53 from nusphere/2.17.x-php83

Update PHP 8.3
laminas · Dec 5, 2023 · f24c4c7 · f24c4c7
2 parents 33af922 + 1d2ec14
commit f24c4c7
Show file tree

Hide file tree

Showing 27 changed files with 707 additions and 500 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -3,6 +3,6 @@
         "mongodb"
     ],
     "ignore_php_platform_requirements": {
-        "8.2": true
+        "8.3": true
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         },
         "sort-packages": true,
         "platform": {
-            "php": "8.0.99"
+            "php": "8.1.99"
         }
     },
     "extra": {
@@ -32,8 +32,8 @@
         }
     },
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
-        "laminas/laminas-servicemanager": "^3.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "laminas/laminas-servicemanager": "^3.21.0",
         "laminas/laminas-stdlib": "^3.0",
         "psr/log": "^1.1.2"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/FilterPluginManagerFactory.php b/src/FilterPluginManagerFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Config;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function is_array;
 

diff --git a/src/FormatterPluginManagerFactory.php b/src/FormatterPluginManagerFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Config;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function is_array;
 

diff --git a/src/LoggerAbstractServiceFactory.php b/src/LoggerAbstractServiceFactory.php
@@ -4,11 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
 use Laminas\ServiceManager\AbstractFactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
@@ -78,7 +77,6 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
      * @param string $name
      * @param string $requestedName
      * @return Logger
-     * @throws ContainerException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

diff --git a/src/LoggerServiceFactory.php b/src/LoggerServiceFactory.php
@@ -5,12 +5,12 @@
 namespace Laminas\Log;
 
 use ArrayAccess;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception\InvalidArgumentException;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 use function get_class;

diff --git a/src/ProcessorPluginManagerFactory.php b/src/ProcessorPluginManagerFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Config;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function is_array;
 

diff --git a/src/PsrLoggerAbstractAdapterFactory.php b/src/PsrLoggerAbstractAdapterFactory.php
@@ -4,11 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
 use Laminas\ServiceManager\AbstractFactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
@@ -35,7 +34,6 @@ public function __construct()
     /**
      * @param string $requestedName
      * @return PsrLoggerAdapter
-     * @throws ContainerException
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */

diff --git a/src/Writer/Factory/WriterFactory.php b/src/Writer/Factory/WriterFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\Log\Writer\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function class_exists;
 use function is_array;

diff --git a/src/WriterPluginManagerFactory.php b/src/WriterPluginManagerFactory.php
@@ -4,10 +4,10 @@
 
 namespace Laminas\Log;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Config;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
+use Psr\Container\ContainerInterface;
 
 use function is_array;
 

diff --git a/test/Filter/SuppressFilterTest.php b/test/Filter/SuppressFilterTest.php
@@ -10,6 +10,8 @@
 
 class SuppressFilterTest extends TestCase
 {
+    private SuppressFilter $filter;
+
     protected function setUp(): void
     {
         $this->filter = new SuppressFilter();

diff --git a/test/FilterPluginManagerCompatibilityTest.php b/test/FilterPluginManagerCompatibilityTest.php
@@ -7,6 +7,7 @@
 use Laminas\Log\Exception\InvalidArgumentException;
 use Laminas\Log\Filter;
 use Laminas\Log\FilterPluginManager;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\ServiceManager\Test\CommonPluginManagerTrait;
 use PHPUnit\Framework\TestCase;
@@ -18,7 +19,7 @@ class FilterPluginManagerCompatibilityTest extends TestCase
     use CommonPluginManagerTrait;
     use ServicesNotSharedByDefaultTrait;
 
-    protected function getPluginManager()
+    protected static function getPluginManager(): AbstractPluginManager
     {
         return new FilterPluginManager(new ServiceManager());
     }

diff --git a/test/FilterPluginManagerFactoryTest.php b/test/FilterPluginManagerFactoryTest.php
@@ -5,13 +5,13 @@
 namespace LaminasTest\Log;
 
 use Closure;
-use Interop\Container\ContainerInterface;
 use Laminas\Log\Filter\FilterInterface;
 use Laminas\Log\FilterPluginManager;
 use Laminas\Log\FilterPluginManagerFactory;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 class FilterPluginManagerFactoryTest extends TestCase
 {
@@ -34,7 +34,7 @@ public function testFactoryReturnsPluginManager(): void
     /**
      * @depends testFactoryReturnsPluginManager
      */
-    public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
+    public function testFactoryConfiguresPluginManagerUnderContainerPSR(): void
     {
         $container = $this->prophesize(ContainerInterface::class)->reveal();
         $filter    = $this->prophesize(FilterInterface::class)->reveal();

diff --git a/test/FormatterPluginManagerCompatibilityTest.php b/test/FormatterPluginManagerCompatibilityTest.php
@@ -7,6 +7,7 @@
 use Laminas\Log\Exception\InvalidArgumentException;
 use Laminas\Log\Formatter;
 use Laminas\Log\FormatterPluginManager;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\ServiceManager\Test\CommonPluginManagerTrait;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +17,7 @@ class FormatterPluginManagerCompatibilityTest extends TestCase
     use CommonPluginManagerTrait;
     use ServicesNotSharedByDefaultTrait;
 
-    protected function getPluginManager()
+    protected static function getPluginManager(): AbstractPluginManager
     {
         return new FormatterPluginManager(new ServiceManager());
     }

diff --git a/test/FormatterPluginManagerFactoryTest.php b/test/FormatterPluginManagerFactoryTest.php
@@ -5,13 +5,13 @@
 namespace LaminasTest\Log;
 
 use Closure;
-use Interop\Container\ContainerInterface;
 use Laminas\Log\Formatter\FormatterInterface;
 use Laminas\Log\FormatterPluginManager;
 use Laminas\Log\FormatterPluginManagerFactory;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 class FormatterPluginManagerFactoryTest extends TestCase
 {
@@ -34,7 +34,7 @@ public function testFactoryReturnsPluginManager(): void
     /**
      * @depends testFactoryReturnsPluginManager
      */
-    public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
+    public function testFactoryConfiguresPluginManagerUnderContainerPSR(): void
     {
         $container = $this->prophesize(ContainerInterface::class)->reveal();
         $formatter = $this->prophesize(FormatterInterface::class)->reveal();

diff --git a/test/LoggerTest.php b/test/LoggerTest.php
@@ -36,8 +36,7 @@
 
 class LoggerTest extends TestCase
 {
-    /** @var Logger */
-    private $logger;
+    private Logger $logger;
 
     protected function setUp(): void
     {

diff --git a/test/ProcessorPluginManagerCompatibilityTest.php b/test/ProcessorPluginManagerCompatibilityTest.php
@@ -7,6 +7,7 @@
 use Laminas\Log\Exception\InvalidArgumentException;
 use Laminas\Log\Processor;
 use Laminas\Log\ProcessorPluginManager;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\ServiceManager\Test\CommonPluginManagerTrait;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +17,7 @@ class ProcessorPluginManagerCompatibilityTest extends TestCase
     use CommonPluginManagerTrait;
     use ServicesNotSharedByDefaultTrait;
 
-    protected function getPluginManager()
+    protected static function getPluginManager(): AbstractPluginManager
     {
         return new ProcessorPluginManager(new ServiceManager());
     }

diff --git a/test/ProcessorPluginManagerFactoryTest.php b/test/ProcessorPluginManagerFactoryTest.php
@@ -5,13 +5,13 @@
 namespace LaminasTest\Log;
 
 use Closure;
-use Interop\Container\ContainerInterface;
 use Laminas\Log\Processor\ProcessorInterface;
 use Laminas\Log\ProcessorPluginManager;
 use Laminas\Log\ProcessorPluginManagerFactory;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 class ProcessorPluginManagerFactoryTest extends TestCase
 {
@@ -34,7 +34,7 @@ public function testFactoryReturnsPluginManager(): void
     /**
      * @depends testFactoryReturnsPluginManager
      */
-    public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
+    public function testFactoryConfiguresPluginManagerUnderContainerPSR(): void
     {
         $container = $this->prophesize(ContainerInterface::class)->reveal();
         $processor = $this->prophesize(ProcessorInterface::class)->reveal();

diff --git a/test/PsrLoggerAdapterTest.php b/test/PsrLoggerAdapterTest.php
@@ -20,6 +20,8 @@
  */
 class PsrLoggerAdapterTest extends LoggerInterfaceTest
 {
+    private MockWriter $mockWriter;
+
     /** @var array */
     protected $psrPriorityMap = [
         LogLevel::EMERGENCY => Logger::EMERG,

diff --git a/test/TestAsset/MockDbDriver.php b/test/TestAsset/MockDbDriver.php
@@ -6,6 +6,8 @@
 
 class MockDbDriver
 {
+    private array $calls;
+
     public function __call($method, $params)
     {
         $this->calls[$method][] = $params;

diff --git a/test/TestAsset/MockDbPlatform.php b/test/TestAsset/MockDbPlatform.php
@@ -6,6 +6,8 @@
 
 class MockDbPlatform
 {
+    private array $calls;
+
     public function __call($method, $params)
     {
         $this->calls[$method][] = $params;

diff --git a/test/Writer/DbTest.php b/test/Writer/DbTest.php
@@ -23,6 +23,10 @@
 
 class DbTest extends TestCase
 {
+    private string $tableName;
+    private MockDbAdapter $db;
+    private DbWriter $writer;
+
     protected function setUp(): void
     {
         $this->tableName = 'db-table-name';

diff --git a/test/Writer/Factory/WriterFactoryTest.php b/test/Writer/Factory/WriterFactoryTest.php
@@ -4,14 +4,14 @@
 
 namespace LaminasTest\Log\Writer\Factory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Log\Writer\Factory\WriterFactory;
 use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LaminasTest\Log\Writer\TestAsset\InvokableObject;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 class WriterFactoryTest extends TestCase
 {

diff --git a/test/Writer/StreamWriterTest.php b/test/Writer/StreamWriterTest.php
@@ -11,6 +11,7 @@
 use Laminas\Log\Formatter\Simple as SimpleFormatter;
 use Laminas\Log\Writer\Stream as StreamWriter;
 use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
 use PHPUnit\Framework\TestCase;
 
 use function fclose;
@@ -29,6 +30,7 @@ class StreamWriterTest extends TestCase
      * Flag used to prevent running tests that require full isolation
      */
     private static $ranSuite = false;
+    private vfsStreamDirectory $root;
 
     protected function setUp(): void
     {

diff --git a/test/WriterPluginManagerCompatibilityTest.php b/test/WriterPluginManagerCompatibilityTest.php
@@ -7,6 +7,7 @@
 use Laminas\Log\Exception\InvalidArgumentException;
 use Laminas\Log\Writer;
 use Laminas\Log\WriterPluginManager;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\ServiceManager\Test\CommonPluginManagerTrait;
 use PHPUnit\Framework\TestCase;
@@ -18,7 +19,7 @@ class WriterPluginManagerCompatibilityTest extends TestCase
     use CommonPluginManagerTrait;
     use ServicesNotSharedByDefaultTrait;
 
-    protected function getPluginManager()
+    protected static function getPluginManager(): AbstractPluginManager
     {
         return new WriterPluginManager(new ServiceManager());
     }

diff --git a/test/WriterPluginManagerFactoryTest.php b/test/WriterPluginManagerFactoryTest.php
@@ -5,13 +5,13 @@
 namespace LaminasTest\Log;
 
 use Closure;
-use Interop\Container\ContainerInterface;
 use Laminas\Log\Writer\WriterInterface;
 use Laminas\Log\WriterPluginManager;
 use Laminas\Log\WriterPluginManagerFactory;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 class WriterPluginManagerFactoryTest extends TestCase
 {
@@ -34,7 +34,7 @@ public function testFactoryReturnsPluginManager(): void
     /**
      * @depends testFactoryReturnsPluginManager
      */
-    public function testFactoryConfiguresPluginManagerUnderContainerInterop(): void
+    public function testFactoryConfiguresPluginManagerUnderContainerPSR(): void
     {
         $container = $this->prophesize(ContainerInterface::class)->reveal();
         $writer    = $this->prophesize(WriterInterface::class)->reveal();