* migrated to laminas

bin/clear-config-cache.php

@@ -4,9 +4,9 @@
  *
  * Can also be invoked as `composer clear-config-cache`.
  *
- * @see       https://github.com/zendframework/zend-expressive-skeleton for the canonical source repository
+ * @see       https://github.com/mezzio/mezzio-skeleton for the canonical source repository
  * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-expressive-skeleton/blob/master/LICENSE.md New BSD License
+ * @license   https://github.com/mezzio/mezzio-skeleton/blob/master/LICENSE.md New BSD License
  */
 
 chdir(__DIR__ . '/../');

composer.json

@@ -1,8 +1,8 @@
 {
-    "name": "zendframework/zend-expressive-skeleton",
+    "name": "mezzio/mezzio-skeleton",
     "description": "Zend expressive skeleton. Begin developing PSR-7 middleware applications in seconds!",
     "type": "project",
-    "homepage": "https://github.com/zendframework/zend-expressive-skeleton",
+    "homepage": "https://github.com/mezzio/mezzio-skeleton",
     "license": "BSD-3-Clause",
     "config": {
         "sort-packages": true
@@ -11,31 +11,33 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.1",
-        "dasprid/container-interop-doctrine": "^1.1",
-        "imagine/imagine": "^1.0",
-        "los/loslog": "^3.1",
-        "roave/security-advisories": "dev-master",
-        "symfony/console": "^4.1",
-        "symfony/yaml": "^4.1",
-        "tuupola/cors-middleware": "^0.9.0",
-        "zendframework/zend-component-installer": "^2.1.1",
-        "zendframework/zend-config": "^3.1",
-        "zendframework/zend-config-aggregator": "^1.0",
-        "zendframework/zend-expressive": "^3.0",
-        "zendframework/zend-expressive-fastroute": "^3.0",
-        "zendframework/zend-expressive-helpers": "^5.0",
-        "zendframework/zend-servicemanager": "^3.3",
-        "zendframework/zend-stdlib": "^3.1",
-        "zendframework/zend-json": "^3.1",
-        "ext-zip": "*",
         "ext-fileinfo": "*",
-        "ext-json": "*"
+        "ext-json": "*",
+        "ext-zip": "*",
+        "imagine/imagine": "^1.0",
+        "laminas/laminas-component-installer": "^2.1.1",
+        "laminas/laminas-config": "^3.1",
+        "laminas/laminas-config-aggregator": "^1.0",
+        "laminas/laminas-dependency-plugin": "^1.0",
+        "laminas/laminas-json": "^3.1",
+        "laminas/laminas-servicemanager": "^3.3",
+        "laminas/laminas-stdlib": "^3.1",
+        "los/loslog": "^3.1",
+        "mezzio/mezzio": "^3.0",
+        "mezzio/mezzio-fastroute": "^3.0",
+        "mezzio/mezzio-helpers": "^5.0",
+        "psr/container": "^1.0",
+        "roave/psr-container-doctrine": "^2.2",
+        "roave/security-advisories": "dev-master",
+        "symfony/console": "^5.0",
+        "symfony/yaml": "^5.0",
+        "tuupola/cors-middleware": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0.1",
-        "squizlabs/php_codesniffer": "^2.9.1",
-        "zfcampus/zf-development-mode": "^3.1",
-        "filp/whoops": "^2.1.12"
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.0",
+        "laminas/laminas-development-mode": "^3.1",
+        "filp/whoops": "^2.1"
     },
     "autoload": {
         "psr-4": {
@@ -52,9 +54,9 @@
         "post-create-project-cmd": [
             "@development-enable"
         ],
-        "development-disable": "zf-development-mode disable",
-        "development-enable": "zf-development-mode enable",
-        "development-status": "zf-development-mode status",
+        "development-disable": "laminas-development-mode disable",
+        "development-enable": "laminas-development-mode enable",
+        "development-status": "laminas-development-mode status",
         "check": [
             "@cs-check",
             "@test"

config/autoload/development.local.php.dist

@@ -11,8 +11,8 @@
 
 declare(strict_types=1);
 
-use Zend\Expressive\Container;
-use Zend\Expressive\Middleware\ErrorResponseGenerator;
+use Mezzio\Container;
+use Mezzio\Middleware\ErrorResponseGenerator;
 
 return [
     'dependencies' => [
@@ -20,8 +20,8 @@ return [
         ],
         'factories'  => [
             ErrorResponseGenerator::class       => Container\WhoopsErrorResponseGeneratorFactory::class,
-            'Zend\Expressive\Whoops'            => Container\WhoopsFactory::class,
-            'Zend\Expressive\WhoopsPageHandler' => Container\WhoopsPageHandlerFactory::class,
+            'Mezzio\Whoops'            => Container\WhoopsFactory::class,
+            'Mezzio\WhoopsPageHandler' => Container\WhoopsPageHandlerFactory::class,
         ],
     ],
 

config/autoload/loslog.global.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Zend\Stratigility\Middleware\ErrorHandler;
+use Laminas\Stratigility\Middleware\ErrorHandler;
 
 return [
     'dependencies' => [

config/autoload/mezzio.global.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Zend\ConfigAggregator\ConfigAggregator;
+use Laminas\ConfigAggregator\ConfigAggregator;
 
 return [
     // Toggle the configuration cache. Set this to boolean false, or remove the
@@ -14,7 +14,7 @@ return [
     // Enable debugging; typically used to provide debugging information within templates.
     'debug' => false,
 
-    'zend-expressive' => [
+    'mezzio' => [
         // Provide templates for the error handling middleware to use when
         // generating responses.
         'error_handler' => [

config/config.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Zend\ConfigAggregator\ArrayProvider;
-use Zend\ConfigAggregator\ConfigAggregator;
-use Zend\ConfigAggregator\PhpFileProvider;
+use Laminas\ConfigAggregator\ArrayProvider;
+use Laminas\ConfigAggregator\ConfigAggregator;
+use Laminas\ConfigAggregator\PhpFileProvider;
 
 // To enable or disable caching, set the `ConfigAggregator::ENABLE_CACHE` boolean in
 // `config/autoload/local.php`.
@@ -13,12 +13,13 @@ $cacheConfig = [
 ];
 
 $aggregator = new ConfigAggregator([
-    \Zend\Expressive\ConfigProvider::class,
-    \Zend\Expressive\Helper\ConfigProvider::class,
-    \Zend\Expressive\Router\FastRouteRouter\ConfigProvider::class,
-    \Zend\Expressive\Router\ConfigProvider::class,
-    \Zend\HttpHandlerRunner\ConfigProvider::class,
-    \Zend\Log\ConfigProvider::class,
+    \Laminas\Diactoros\ConfigProvider::class,
+    \Mezzio\ConfigProvider::class,
+    \Mezzio\Helper\ConfigProvider::class,
+    \Mezzio\Router\FastRouteRouter\ConfigProvider::class,
+    \Mezzio\Router\ConfigProvider::class,
+    \Laminas\HttpHandlerRunner\ConfigProvider::class,
+    \Laminas\Log\ConfigProvider::class,
 
     // Include cache configuration
     new ArrayProvider($cacheConfig),
@@ -37,6 +38,6 @@ $aggregator = new ConfigAggregator([
 
     // Load development config if it exists
     new PhpFileProvider(realpath(__DIR__) . '/development.config.php'),
-], $cacheConfig['config_cache_path']);
+], $cacheConfig['config_cache_path'], [\Laminas\ZendFrameworkBridge\ConfigPostProcessor::class]);
 
 return $aggregator->getMergedConfig();

config/container.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
 
 // Load configuration
 $config = require __DIR__ . '/config.php';

config/development.config.php.dist

@@ -2,7 +2,7 @@
 /**
  * File required to allow enablement of development mode.
  *
- * For use with the zf-development-mode tool.
+ * For use with the laminas-development-mode tool.
  *
  * Usage:
  *  $ composer development-disable
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-use Zend\ConfigAggregator\ConfigAggregator;
+use Laminas\ConfigAggregator\ConfigAggregator;
 
 return [
     'debug' => true,

config/pipeline.php

@@ -4,16 +4,16 @@ declare(strict_types=1);
 
 use Psr\Container\ContainerInterface;
 use Tuupola\Middleware\CorsMiddleware;
-use Zend\Expressive\Application;
-use Zend\Expressive\Handler\NotFoundHandler;
-use Zend\Expressive\Helper\ServerUrlMiddleware;
-use Zend\Expressive\Helper\UrlHelperMiddleware;
-use Zend\Expressive\MiddlewareFactory;
-use Zend\Expressive\Router\Middleware\DispatchMiddleware;
-use Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware;
-use Zend\Expressive\Router\Middleware\MethodNotAllowedMiddleware;
-use Zend\Expressive\Router\Middleware\RouteMiddleware;
-use Zend\Stratigility\Middleware\ErrorHandler;
+use Mezzio\Application;
+use Mezzio\Handler\NotFoundHandler;
+use Mezzio\Helper\ServerUrlMiddleware;
+use Mezzio\Helper\UrlHelperMiddleware;
+use Mezzio\MiddlewareFactory;
+use Mezzio\Router\Middleware\DispatchMiddleware;
+use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
+use Mezzio\Router\Middleware\MethodNotAllowedMiddleware;
+use Mezzio\Router\Middleware\RouteMiddleware;
+use Laminas\Stratigility\Middleware\ErrorHandler;
 
 /**
  * Setup middleware pipeline:
@@ -43,7 +43,7 @@ return function (Application $app, MiddlewareFactory $factory, ContainerInterfac
     // - $app->pipe('/files', $filesMiddleware);
 
     // Register the routing middleware in the middleware pipeline.
-    // This middleware registers the Zend\Expressive\Router\RouteResult request attribute.
+    // This middleware registers the Mezzio\Router\RouteResult request attribute.
     $app->pipe(RouteMiddleware::class);
 
     // The following handle routing failures for common conditions:

config/routes.php

@@ -3,8 +3,8 @@
 declare(strict_types=1);
 
 use Psr\Container\ContainerInterface;
-use Zend\Expressive\Application;
-use Zend\Expressive\MiddlewareFactory;
+use Mezzio\Application;
+use Mezzio\MiddlewareFactory;
 
 /**
  * Setup routes with a single request method:
@@ -28,7 +28,7 @@ use Zend\Expressive\MiddlewareFactory;
  * $app->route(
  *     '/contact',
  *     App\Handler\ContactHandler::class,
- *     Zend\Expressive\Router\Route::HTTP_METHOD_ANY,
+ *     Mezzio\Router\Route::HTTP_METHOD_ANY,
  *     'contact'
  * );
  */

public/index.php

@@ -17,9 +17,9 @@ require 'vendor/autoload.php';
     /** @var \Psr\Container\ContainerInterface $container */
     $container = require 'config/container.php';
 
-    /** @var \Zend\Expressive\Application $app */
-    $app = $container->get(\Zend\Expressive\Application::class);
-    $factory = $container->get(\Zend\Expressive\MiddlewareFactory::class);
+    /** @var \Mezzio\Application $app */
+    $app = $container->get(\Mezzio\Application::class);
+    $factory = $container->get(\Mezzio\MiddlewareFactory::class);
 
     // Execute programmatic/declarative middleware pipeline and routing
     // configuration statements

src/ApiLibs/AbstractHandler/CrudHandler.php

@@ -7,9 +7,9 @@ namespace ApiLibs\AbstractHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
-use Zend\Diactoros\Response\JsonResponse;
-use Zend\Json\Json;
+use Laminas\Diactoros\Response\EmptyResponse;
+use Laminas\Diactoros\Response\JsonResponse;
+use Laminas\Json\Json;
 
 abstract class CrudHandler implements RequestHandlerInterface
 {

src/App/ConfigProvider.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App;
 
-use ContainerInteropDoctrine\EntityManagerFactory;
+use Roave\PsrContainerDoctrine\EntityManagerFactory;
 
 /**
  * The configuration provider for the App module

src/App/Handler/Album.php

@@ -8,7 +8,7 @@ use ApiLibs\AbstractHandler\CrudHandler;
 use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class Album extends CrudHandler
 {

src/App/Handler/Collection.php

@@ -8,7 +8,7 @@ use ApiLibs\AbstractHandler\CrudHandler;
 use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class Collection extends CrudHandler
 {

src/App/Handler/ExportAlbum.php

@@ -8,7 +8,7 @@ use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\RedirectResponse;
+use Laminas\Diactoros\Response\RedirectResponse;
 
 class ExportAlbum implements RequestHandlerInterface
 {

src/App/Handler/GetImage.php

@@ -8,8 +8,8 @@ use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
 
 class GetImage implements RequestHandlerInterface
 {

src/App/Handler/HomePage.php

@@ -7,7 +7,7 @@ namespace App\Handler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class HomePage implements RequestHandlerInterface
 {

src/App/Handler/Image.php

@@ -8,7 +8,7 @@ use ApiLibs\AbstractHandler\CrudHandler;
 use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class Image extends CrudHandler
 {

src/App/Handler/ListGalleries.php

@@ -8,7 +8,7 @@ use App\Service\GalleryService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class ListGalleries implements RequestHandlerInterface
 {

src/App/Hydrator/DoctrineObject.php

@@ -26,9 +26,9 @@ use Doctrine\Common\Util\Inflector;
 use InvalidArgumentException;
 use RuntimeException;
 use Traversable;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Hydrator\AbstractHydrator;
-use Zend\Hydrator\Filter\FilterProviderInterface;
+use Laminas\Stdlib\ArrayUtils;
+use Laminas\Hydrator\AbstractHydrator;
+use Laminas\Hydrator\Filter\FilterProviderInterface;
 
 /**
  * This hydrator has been completely refactored for DoctrineModule 0.7.0. It provides an easy and powerful way

src/App/Hydrator/Filter/PropertyName.php

@@ -19,7 +19,7 @@
 
 namespace App\Hydrator\Filter;
 
-use Zend\Hydrator\Filter\FilterInterface;
+use Laminas\Hydrator\Filter\FilterInterface;
 
 /**
  * Provides a filter to restrict returned fields by whitelisting or

src/App/Hydrator/Strategy/AbstractCollectionStrategy.php

@@ -22,7 +22,7 @@ namespace App\Hydrator\Strategy;
 use InvalidArgumentException;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Zend\Hydrator\Strategy\StrategyInterface;
+use Laminas\Hydrator\Strategy\StrategyInterface;
 
 /**
  * @license MIT

src/App/Service/GalleryService.php

@@ -12,7 +12,7 @@ use Imagine\Gd\Imagine;
 use Imagine\Image\Box;
 use Imagine\Image\ImageInterface;
 use Symfony\Component\Yaml\Parser;
-use Zend\Config\Reader\Yaml;
+use Laminas\Config\Reader\Yaml;
 
 class GalleryService
 {

test/AppTest/Action/HomePageActionTest.php

@@ -7,10 +7,10 @@ use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\HtmlResponse;
-use Zend\Diactoros\Response\JsonResponse;
-use Zend\Expressive\Router\RouterInterface;
-use Zend\Expressive\Template\TemplateRendererInterface;
+use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\JsonResponse;
+use Mezzio\Router\RouterInterface;
+use Mezzio\Template\TemplateRendererInterface;
 
 class HomePageActionTest extends TestCase
 {

test/AppTest/Action/HomePageFactoryTest.php

@@ -6,8 +6,8 @@ use App\Handler\HomePage;
 use App\Handler\HomePageFactory;
 use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
-use Zend\Expressive\Router\RouterInterface;
-use Zend\Expressive\Template\TemplateRendererInterface;
+use Mezzio\Router\RouterInterface;
+use Mezzio\Template\TemplateRendererInterface;
 
 class HomePageFactoryTest extends TestCase
 {

test/AppTest/Action/PingActionTest.php

@@ -6,7 +6,7 @@ use App\Handler\PingAction;
 use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\JsonResponse;
+use Laminas\Diactoros\Response\JsonResponse;
 
 class PingActionTest extends TestCase
 {