Merge pull request #37 from weierophinney/feature/lcs-2.3

Adopt laminas-coding-standard 2.3 rules
laminas-api-tools · Jun 24, 2021 · 2d92061 · 2d92061
2 parents 2b0e511 + 5f100d7
commit 2d92061
Show file tree

Hide file tree

Showing 20 changed files with 1,579 additions and 752 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        {"name": "PHPUnit on PHP 7.3 with locked dependencies"}
+    ]
+}
diff --git a/composer.json b/composer.json
@@ -33,10 +33,10 @@
     "require-dev": {
         "laminas-api-tools/api-tools-admin": "^1.6",
         "laminas-api-tools/api-tools-asset-manager": "^1.2",
-        "laminas/laminas-coding-standard": "^2.1",
+        "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-composer-autoloading": "^2.1",
         "laminas/laminas-developer-tools": "^1.2.1",
-        "laminas/laminas-test": "^3.4",
+        "laminas/laminas-test": "^3.5",
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-master",
         "zfcampus/zf-deploy": "^1.3"

diff --git a/composer.lock b/composer.lock
diff --git a/config/application.config.php b/config/application.config.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 return [
     // Retrieve the list of modules for this application.

diff --git a/config/autoload/api-tools-config.global.php b/config/autoload/api-tools-config.global.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 return [
     'view_manager' => [

diff --git a/config/autoload/api-tools-mvc-auth-oauth2-override.global.php b/config/autoload/api-tools-mvc-auth-oauth2-override.global.php
@@ -6,6 +6,8 @@
  * OAuth2\Server instances.
  */
 
+declare(strict_types=1);
+
 use Laminas\ApiTools\MvcAuth\Factory\NamedOAuth2ServerFactory;
 use Laminas\ApiTools\OAuth2\Service\OAuth2Server;
 

diff --git a/config/autoload/global-development.php b/config/autoload/global-development.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 use Laminas\ApiTools\Admin\Model\ModulePathSpec;
 

diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 return [
     'api-tools-content-negotiation' => [

diff --git a/config/autoload/user.global.php b/config/autoload/user.global.php
@@ -1,11 +1,5 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
-
 /**
  * Global Configuration Override
  *
@@ -18,6 +12,8 @@
  * file.
  */
 
+declare(strict_types=1);
+
 return [
     // ...
 ];
diff --git a/config/development.config.php.dist b/config/development.config.php.dist
@@ -1,11 +1,5 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
-
 return [
     // Development time modules
     'modules' => [

diff --git a/config/modules.config.php b/config/modules.config.php
@@ -1,14 +1,11 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
-
 /**
  * List of enabled modules for this application.
  */
+
+declare(strict_types=1);
+
 return [
     'Laminas\Db',
     'Laminas\Filter',

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Application;
 

diff --git a/module/Application/src/Controller/IndexController.php b/module/Application/src/Controller/IndexController.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Application\Controller;
 

diff --git a/module/Application/src/Module.php b/module/Application/src/Module.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Application;
 

diff --git a/module/Application/test/Controller/IndexControllerTest.php b/module/Application/test/Controller/IndexControllerTest.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace ApplicationTest\Controller;
 

diff --git a/module/Application/test/Controller/ZZIndexControllerDevModeTest.php b/module/Application/test/Controller/ZZIndexControllerDevModeTest.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace ApplicationTest\Controller;
 

diff --git a/phpcs.xml → phpcs.xml.dist b/phpcs.xml → phpcs.xml.dist
diff --git a/public/.gitignore b/public/.gitignore
@@ -1,2 +1,4 @@
 apigility-ui/
 zf-apigility/
+api-tools-ui/
+api-tools/
diff --git a/src/ApiTools/constants.php b/src/ApiTools/constants.php
@@ -1,11 +1,7 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace ApiTools;
 
-const VERSION = '1.5.1dev';
+const VERSION = '1.6.0dev';
diff --git a/src/remove-package-artifacts.php b/src/remove-package-artifacts.php
@@ -3,12 +3,10 @@
 /**
  * This file is triggered by the post-create-project-cmd event in order to
  * remove the github workflows used by the package, as well as this file itself.
- *
- * @see       https://github.com/laminas-api-tools/api-tools-skeleton for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-skeleton/blob/master/LICENSE.md New BSD License
  */
 
+declare(strict_types=1);
+
 /**
  * @param string $path
  * @return void