Rewriting as Laminas Project package

mezzio · Dec 31, 2019 · 6b1918c · 6b1918c
1 parent ad11985
commit 6b1918c
Show file tree

Hide file tree

Showing 72 changed files with 674 additions and 951 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
-.idea
-composer.phar
-composer.lock
-clover.xml
-coveralls-upload.json
-phpunit.xml
-vendor/
+/clover.xml
+/composer.lock
+/coveralls-upload.json
+/phpunit.xml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ env:
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
+  fast_finish: true
   include:
     - php: 7.1
       env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/COPYRIGHT.md b/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,20 +1,19 @@
-Copyright (c) 2015-2018, Zend Technologies USA, Inc.
-
+Copyright (c) 2019, Laminas Foundation
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
 - Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-- Neither the name of Zend Technologies USA, Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+- Neither the name of Laminas Foundation nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# Expressive Skeleton and Installer
+# Mezzio Skeleton and Installer
 
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-skeleton.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-skeleton)
-[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-skeleton/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-skeleton?branch=master)
+[![Build Status](https://travis-ci.org/mezzio/mezzio-skeleton.svg?branch=master)](https://travis-ci.org/mezzio/mezzio-skeleton)
+[![Coverage Status](https://coveralls.io/repos/github/mezzio/mezzio-skeleton/badge.svg?branch=master)](https://coveralls.io/github/mezzio/mezzio-skeleton?branch=master)
 
 *Begin developing PSR-15 middleware applications in seconds!*
 
-[zend-expressive](https://github.com/zendframework/zend-expressive) builds on
-[zend-stratigility](https://github.com/zendframework/zend-stratigility) to
+[mezzio](https://github.com/mezzio/mezzio) builds on
+[laminas-stratigility](https://github.com/laminas/laminas-stratigility) to
 provide a minimalist PSR-15 middleware framework for PHP with routing, DI
 container, optional templating, and optional error handling capabilities.
 
-This installer will setup a skeleton application based on zend-expressive by
+This installer will setup a skeleton application based on mezzio by
 choosing optional packages based on user input as demonstrated in the following
 screenshot:
 
@@ -24,10 +24,10 @@ removed.
 
 ## Getting Started
 
-Start your new Expressive project with composer:
+Start your new Mezzio project with composer:
 
 ```bash
-$ composer create-project zendframework/zend-expressive-skeleton <project-path>
+$ composer create-project mezzio/mezzio-skeleton <project-path>
 ```
 
 After choosing and installing the packages you want, go to the
@@ -84,7 +84,7 @@ If neither of the above help, you might face more serious issues:
 
 ## Application Development Mode Tool
 
-This skeleton comes with [zf-development-mode](https://github.com/zfcampus/zf-development-mode). 
+This skeleton comes with [laminas-development-mode](https://github.com/laminas/laminas-development-mode). 
 It provides a composer script to allow you to enable and disable development mode.
 
 ### To enable development mode
@@ -132,7 +132,7 @@ local `$cacheConfig` variable.
 ## Skeleton Development
 
 This section applies only if you cloned this repo with `git clone`, not when you
-installed expressive with `composer create-project ...`.
+installed mezzio with `composer create-project ...`.
 
 If you want to run tests against the installer, you need to clone this repo and
 setup all dependencies with composer.  Make sure you **prevent composer running

diff --git a/bin/clear-config-cache.php b/bin/clear-config-cache.php
@@ -1,12 +1,9 @@
 <?php
+
 /**
- * Script for clearing the configuration cache.
- *
- * Can also be invoked as `composer clear-config-cache`.
- *
- * @see       https://github.com/zendframework/zend-expressive-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
+ * @see       https://github.com/mezzio/mezzio-skeleton for the canonical source repository
+ * @copyright https://github.com/mezzio/mezzio-skeleton/blob/master/COPYRIGHT.md
+ * @license   https://github.com/mezzio/mezzio-skeleton/blob/master/LICENSE.md New BSD License
  */
 
 declare(strict_types=1);

diff --git a/composer.json b/composer.json
@@ -1,20 +1,27 @@
 {
-    "name": "zendframework/zend-expressive-skeleton",
-    "description": "Zend expressive skeleton. Begin developing PSR-15 middleware applications in seconds!",
+    "name": "mezzio/mezzio-skeleton",
+    "description": "Laminas mezzio skeleton. Begin developing PSR-15 middleware applications in seconds!",
     "type": "project",
-    "homepage": "https://github.com/zendframework/zend-expressive-skeleton",
     "license": "BSD-3-Clause",
     "keywords": [
+        "laminas",
+        "mezzio",
         "skeleton",
         "middleware",
         "psr",
         "psr-7",
         "psr-11",
-        "psr-15",
-        "zf",
-        "zendframework",
-        "zend-expressive"
+        "psr-15"
     ],
+    "homepage": "https://mezzio.dev",
+    "support": {
+        "docs": "https://docs.mezzio.dev/mezzio-skeleton/",
+        "issues": "https://github.com/mezzio/mezzio-skeleton/issues",
+        "source": "https://github.com/mezzio/mezzio-skeleton",
+        "rss": "https://github.com/mezzio/mezzio-skeleton/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
+    },
     "config": {
         "sort-packages": true
     },
@@ -23,76 +30,72 @@
             "dev-master": "3.2.x-dev",
             "dev-develop": "3.3.x-dev"
         },
-        "zf": {
+        "laminas": {
             "component-whitelist": [
-                "zendframework/zend-expressive",
-                "zendframework/zend-expressive-helpers",
-                "zendframework/zend-expressive-router",
-                "zendframework/zend-httphandlerrunner"
+                "mezzio/mezzio",
+                "mezzio/mezzio-helpers",
+                "mezzio/mezzio-router",
+                "laminas/laminas-httphandlerrunner"
             ]
         }
     },
-    "support": {
-        "issues": "https://github.com/zendframework/zend-expressive-skeleton/issues",
-        "source": "https://github.com/zendframework/zend-expressive-skeleton",
-        "rss": "https://github.com/zendframework/zend-expressive-skeleton/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
-        "forum": "https://discourse.zendframework.com/c/questions/expressive"
-    },
     "require": {
         "php": "^7.1",
-        "zendframework/zend-component-installer": "^2.1.1",
-        "zendframework/zend-config-aggregator": "^1.0",
-        "zendframework/zend-diactoros": "^1.7.1 || ^2.0",
-        "zendframework/zend-expressive": "^3.0.1",
-        "zendframework/zend-expressive-helpers": "^5.0",
-        "zendframework/zend-stdlib": "^3.2.1"
+        "laminas/laminas-component-installer": "^2.1.1",
+        "laminas/laminas-config-aggregator": "^1.0",
+        "laminas/laminas-diactoros": "^1.7.1 || ^2.0",
+        "laminas/laminas-stdlib": "^3.2.1",
+        "laminas/laminas-zendframework-bridge": "^1.0",
+        "mezzio/mezzio": "^3.0.1",
+        "mezzio/mezzio-helpers": "^5.0"
     },
     "require-dev": {
         "composer/composer": "^1.5",
         "elie29/zend-phpdi-config": "^3.0",
         "filp/whoops": "^2.1.12",
         "jsoumelidis/zend-sf-di-config": "^0.3",
+        "laminas/laminas-auradi-config": "^1.0",
+        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-development-mode": "^3.1",
+        "laminas/laminas-pimple-config": "^1.0",
+        "laminas/laminas-servicemanager": "^3.3",
+        "mezzio/mezzio-aurarouter": "^3.0",
+        "mezzio/mezzio-fastroute": "^3.0",
+        "mezzio/mezzio-laminasrouter": "^3.0",
+        "mezzio/mezzio-laminasviewrenderer": "^2.0.2",
+        "mezzio/mezzio-platesrenderer": "^2.0",
+        "mezzio/mezzio-tooling": "^1.0",
+        "mezzio/mezzio-twigrenderer": "^2.0",
         "mikey179/vfsstream": "^1.6.5",
         "northwoods/container": "^3.0",
         "phpstan/phpstan": "^0.9.2",
         "phpstan/phpstan-strict-rules": "^0.9.0",
         "phpunit/phpunit": "^7.0.1",
         "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^2.9.1",
-        "zendframework/zend-auradi-config": "^1.0",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-expressive-aurarouter": "^3.0",
-        "zendframework/zend-expressive-fastroute": "^3.0",
-        "zendframework/zend-expressive-platesrenderer": "^2.0",
-        "zendframework/zend-expressive-tooling": "^1.0",
-        "zendframework/zend-expressive-twigrenderer": "^2.0",
-        "zendframework/zend-expressive-zendrouter": "^3.0",
-        "zendframework/zend-expressive-zendviewrenderer": "^2.0.2",
-        "zendframework/zend-pimple-config": "^1.0",
-        "zendframework/zend-servicemanager": "^3.3",
-        "zfcampus/zf-development-mode": "^3.1"
+        "squizlabs/php_codesniffer": "^2.9.1"
     },
     "autoload": {
         "psr-4": {
             "App\\": "src/App/src/",
-            "ExpressiveInstaller\\": "src/ExpressiveInstaller/"
+            "MezzioInstaller\\": "src/MezzioInstaller/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "AppTest\\": "test/AppTest/",
-            "ExpressiveInstallerTest\\": "test/ExpressiveInstallerTest/"
+            "MezzioInstallerTest\\": "test/MezzioInstallerTest/"
         }
     },
     "scripts": {
-        "pre-install-cmd": "ExpressiveInstaller\\OptionalPackages::install",
-        "pre-update-cmd": "ExpressiveInstaller\\OptionalPackages::install",
-        "post-create-project-cmd": ["@development-enable"],
-        "development-disable": "zf-development-mode disable",
-        "development-enable": "zf-development-mode enable",
-        "development-status": "zf-development-mode status",
-        "expressive": "expressive --ansi",
+        "pre-install-cmd": "MezzioInstaller\\OptionalPackages::install",
+        "pre-update-cmd": "MezzioInstaller\\OptionalPackages::install",
+        "post-create-project-cmd": [
+            "@development-enable"
+        ],
+        "development-disable": "laminas-development-mode disable",
+        "development-enable": "laminas-development-mode enable",
+        "development-status": "laminas-development-mode status",
+        "mezzio": "mezzio --ansi",
         "check": [
             "@cs-check",
             "@test",
@@ -105,5 +108,8 @@
         "serve": "php -S 0.0.0.0:8080 -t public/",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
+    "replace": {
+        "zendframework/zend-expressive-skeleton": "self.version"
     }
 }
diff --git a/config/autoload/development.local.php.dist b/config/autoload/development.local.php.dist
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Development-only configuration.
  *

diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Local configuration.
  *

diff --git a/config/autoload/zend-expressive.global.php → config/autoload/mezzio.global.php b/config/autoload/zend-expressive.global.php → 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 @@
     // 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' => [

diff --git a/config/config.php b/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`.
@@ -16,13 +16,13 @@
     // Include cache configuration
     new ArrayProvider($cacheConfig),
 
-    \Zend\Expressive\Helper\ConfigProvider::class,
-    \Zend\Expressive\ConfigProvider::class,
-    \Zend\Expressive\Router\ConfigProvider::class,
+    \Mezzio\Helper\ConfigProvider::class,
+    \Mezzio\ConfigProvider::class,
+    \Mezzio\Router\ConfigProvider::class,
 
     // Swoole config to overwrite some services (if installed)
-    class_exists(\Zend\Expressive\Swoole\ConfigProvider::class)
-        ? \Zend\Expressive\Swoole\ConfigProvider::class
+    class_exists(\Mezzio\Swoole\ConfigProvider::class)
+        ? \Mezzio\Swoole\ConfigProvider::class
         : function(){ return[]; },
 
     // Default App module config

diff --git a/config/development.config.php.dist b/config/development.config.php.dist
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * 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 +23,7 @@
 
 declare(strict_types=1);
 
-use Zend\ConfigAggregator\ConfigAggregator;
+use Laminas\ConfigAggregator\ConfigAggregator;
 
 return [
     'debug' => true,