Merge pull request #222 from dotkernel/issue-213

Bump to PHP 8.3
dotkernel · Feb 27, 2024 · 8574194 · 8574194
2 parents d46527b + 1d5602a
commit 8574194
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 89 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -15,8 +15,8 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/cs-tests.yml b/.github/workflows/cs-tests.yml
@@ -15,8 +15,8 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,8 +15,8 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -15,8 +15,8 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Based on Enrico Zimuel's [Zend Expressive API - Skeleton example](https://github.com/ezimuel/zend-expressive-api), DotKernel API runs on [Laminas](https://github.com/laminas) and [Mezzio](https://github.com/mezzio) components and implements standards like PSR-3, PSR-4, PSR-7, PSR-11 and PSR-15.
 
 ![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/api)
-![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/4.2.0)
+![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/4.3.0)
 
 [![GitHub issues](https://img.shields.io/github/issues/dotkernel/api)](https://github.com/dotkernel/api/issues)
 [![GitHub forks](https://img.shields.io/github/forks/dotkernel/api)](https://github.com/dotkernel/api/network)

diff --git a/composer.json b/composer.json
@@ -42,44 +42,44 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.2.0 || ~8.3.0",
         "ext-gd": "*",
         "ext-json": "*",
-        "dotkernel/dot-annotated-services": "^4.1.2",
-        "dotkernel/dot-cli": "^3.4.0",
-        "dotkernel/dot-data-fixtures": "^1.1.1",
-        "dotkernel/dot-doctrine-metadata": "^3.2.0",
-        "dotkernel/dot-errorhandler": "^3.3.1",
-        "dotkernel/dot-mail": "~4.1.0",
-        "dotkernel/dot-response-header": "^3.2.0",
-        "laminas/laminas-component-installer": "^3.3.0",
-        "laminas/laminas-config": "^3.7.0",
-        "laminas/laminas-config-aggregator": "^1.7.0",
-        "laminas/laminas-http": "^2.15.1",
-        "laminas/laminas-hydrator": "^4.3.1",
-        "laminas/laminas-inputfilter": "^2.18.0",
-        "laminas/laminas-paginator": "^2.12.2",
-        "laminas/laminas-stdlib": "^3.10.1",
-        "laminas/laminas-text": "^2.9.0",
-        "mezzio/mezzio": "^3.13.0",
-        "mezzio/mezzio-authentication-oauth2": "^2.4.1",
-        "mezzio/mezzio-authorization-acl": "^1.3.0",
-        "mezzio/mezzio-authorization-rbac": "^1.3.0",
-        "mezzio/mezzio-cors": "^1.3.0",
-        "mezzio/mezzio-fastroute": "^3.5.0",
-        "mezzio/mezzio-problem-details": "^1.6.2",
-        "mezzio/mezzio-twigrenderer": "^2.9.0",
-        "ramsey/uuid-doctrine": "^1.8.1",
-        "roave/psr-container-doctrine": "^3.5.0",
-        "symfony/filesystem": "^6.2"
+        "dotkernel/dot-annotated-services": "^4.1.7",
+        "dotkernel/dot-cli": "^3.5.0",
+        "dotkernel/dot-data-fixtures": "^1.1.3",
+        "dotkernel/dot-doctrine-metadata": "^3.2.2",
+        "dotkernel/dot-errorhandler": "^3.3.2",
+        "dotkernel/dot-mail": "^4.1.1",
+        "dotkernel/dot-response-header": "^3.2.3",
+        "laminas/laminas-component-installer": "^3.4.0",
+        "laminas/laminas-config": "^3.9.0",
+        "laminas/laminas-config-aggregator": "^1.14.0",
+        "laminas/laminas-http": "^2.19.0",
+        "laminas/laminas-hydrator": "^4.15.0",
+        "laminas/laminas-inputfilter": "^2.29.0",
+        "laminas/laminas-paginator": "^2.18.0",
+        "laminas/laminas-stdlib": "^3.19.0",
+        "laminas/laminas-text": "^2.11.0",
+        "mezzio/mezzio": "^3.19.0",
+        "mezzio/mezzio-authentication-oauth2": "^2.8.0",
+        "mezzio/mezzio-authorization-acl": "^1.10.0",
+        "mezzio/mezzio-authorization-rbac": "^1.7.0",
+        "mezzio/mezzio-cors": "^1.11.1",
+        "mezzio/mezzio-fastroute": "^3.11.0",
+        "mezzio/mezzio-problem-details": "^1.13.1",
+        "mezzio/mezzio-twigrenderer": "^2.15.0",
+        "ramsey/uuid-doctrine": "^2.0.0",
+        "roave/psr-container-doctrine": "^4.1.0",
+        "symfony/filesystem": "^7.0.3"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "^2.5",
-        "laminas/laminas-development-mode": "^3.6",
-        "mezzio/mezzio-tooling": "^2.5",
-        "phpunit/phpunit": "^10.2",
+        "laminas/laminas-development-mode": "^3.12.0",
+        "mezzio/mezzio-tooling": "^2.9.0",
+        "phpunit/phpunit": "^10.5.10",
         "roave/security-advisories": "dev-latest",
-        "vimeo/psalm": "^5.13"
+        "vimeo/psalm": "^5.22.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/config/autoload/doctrine.global.php b/config/autoload/doctrine.global.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\Common\Cache\PhpFileCache;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;
@@ -49,12 +48,6 @@
             UuidBinaryType::NAME            => UuidBinaryType::class,
             UuidBinaryOrderedTimeType::NAME => UuidBinaryOrderedTimeType::class,
         ],
-        'cache'      => [
-            PhpFileCache::class => [
-                'class'     => PhpFileCache::class,
-                'directory' => getcwd() . '/data/cache/doctrine',
-            ],
-        ],
         'fixtures'   => getcwd() . '/data/doctrine/fixtures',
     ],
     'resultCacheLifetime' => 3600,

diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Api\App\Entity\EntityListenerResolver;
-use Doctrine\Common\Cache\PhpFileCache;
 
 $baseUrl = 'http://localhost:8080';
 
@@ -22,7 +21,6 @@ $databases = [
 ];
 
 return [
-    'annotations_cache_dir' => getcwd() . '/data/cache/annotations',
     'application'           => [
         'name' => 'DotKernel API',
         'url'  => $baseUrl,
@@ -55,11 +53,6 @@ return [
         ],
         'configuration' => [
             'orm_default' => [
-                // it is recommended to disable doctrine cache on development
-                // just comment any type of cache you don't want to be applied on development
-                'query_cache'              => PhpFileCache::class,
-                'metadata_cache'           => PhpFileCache::class,
-                'result_cache'             => PhpFileCache::class,
                 'entity_listener_resolver' => EntityListenerResolver::class,
             ],
         ],

diff --git a/src/App/src/ConfigProvider.php b/src/App/src/ConfigProvider.php
@@ -7,7 +7,6 @@
 use Api\App\Command\RouteListCommand;
 use Api\App\Command\TokenGenerateCommand;
 use Api\App\Entity\EntityListenerResolver;
-use Api\App\Factory\AnnotationsCacheFactory;
 use Api\App\Factory\AuthenticationMiddlewareFactory;
 use Api\App\Factory\EntityListenerResolverFactory;
 use Api\App\Factory\RouteListCommandFactory;
@@ -19,7 +18,6 @@
 use Api\App\Service\ErrorReportServiceInterface;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
-use Dot\AnnotatedServices\Factory\AbstractAnnotatedFactory;
 use Dot\AnnotatedServices\Factory\AnnotatedServiceFactory;
 use Dot\Mail\Factory\MailOptionsAbstractFactory;
 use Dot\Mail\Factory\MailServiceAbstractFactory;
@@ -60,20 +58,19 @@ public function getDependencies(): array
                 ],
             ],
             'factories'  => [
-                'doctrine.entity_manager.orm_default'   => EntityManagerFactory::class,
-                'dot-mail.options.default'              => MailOptionsAbstractFactory::class,
-                'dot-mail.service.default'              => MailServiceAbstractFactory::class,
-                AbstractAnnotatedFactory::CACHE_SERVICE => AnnotationsCacheFactory::class,
-                AuthenticationMiddleware::class         => AuthenticationMiddlewareFactory::class,
-                AuthorizationMiddleware::class          => AnnotatedServiceFactory::class,
-                Environment::class                      => TwigEnvironmentFactory::class,
-                TwigExtension::class                    => TwigExtensionFactory::class,
-                TwigRenderer::class                     => TwigRendererFactory::class,
-                ErrorResponseMiddleware::class          => AnnotatedServiceFactory::class,
-                RouteListCommand::class                 => RouteListCommandFactory::class,
-                TokenGenerateCommand::class             => TokenGenerateCommandFactory::class,
-                ErrorReportService::class               => AnnotatedServiceFactory::class,
-                EntityListenerResolver::class           => EntityListenerResolverFactory::class,
+                'doctrine.entity_manager.orm_default' => EntityManagerFactory::class,
+                'dot-mail.options.default'            => MailOptionsAbstractFactory::class,
+                'dot-mail.service.default'            => MailServiceAbstractFactory::class,
+                AuthenticationMiddleware::class       => AuthenticationMiddlewareFactory::class,
+                AuthorizationMiddleware::class        => AnnotatedServiceFactory::class,
+                Environment::class                    => TwigEnvironmentFactory::class,
+                TwigExtension::class                  => TwigExtensionFactory::class,
+                TwigRenderer::class                   => TwigRendererFactory::class,
+                ErrorResponseMiddleware::class        => AnnotatedServiceFactory::class,
+                RouteListCommand::class               => RouteListCommandFactory::class,
+                TokenGenerateCommand::class           => TokenGenerateCommandFactory::class,
+                ErrorReportService::class             => AnnotatedServiceFactory::class,
+                EntityListenerResolver::class         => EntityListenerResolverFactory::class,
             ],
             'aliases'    => [
                 Authentication\AuthenticationInterface::class => Authentication\OAuth2\OAuth2Adapter::class,

diff --git a/src/App/src/Factory/AnnotationsCacheFactory.php b/src/App/src/Factory/AnnotationsCacheFactory.php
diff --git a/test/Functional/.gitignore b/test/Functional/.gitignore
@@ -0,0 +1 @@
+test.jpg