Working on next version

GrahamCampbell · GrahamCampbell · commit 4cf2c04621d6 · 2020-01-01T10:45:45.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -5,5 +5,6 @@
 /.github export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /README.md export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 composer.lock
+phpstan.neon
 phpunit.xml
 vendor
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,94 @@
-dist: xenial
-
 matrix:
   include:
-    - env:
-        - PHP_VERSION=5.6
-    - env:
+    - name: PHP 7.0; Symfony 3
+      dist: xenial
+      env:
         - PHP_VERSION=7.0
-    - env:
+        - SYMFONY_VERSION=^3.4
+        - RUN_PHPUNIT=true
+    - name: PHP 7.1; Symfony 3
+      dist: bionic
+      env:
+        - PHP_VERSION=7.1
+        - SYMFONY_VERSION=^3.4
+        - RUN_PHPUNIT=true
+    - name: PHP 7.1; Symfony 4
+      dist: bionic
+      env:
         - PHP_VERSION=7.1
-    - env:
+        - SYMFONY_VERSION=^4.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.2; Symfony 3
+      dist: bionic
+      env:
+        - PHP_VERSION=7.2
+        - SYMFONY_VERSION=^3.4
+        - RUN_PHPUNIT=true
+    - name: PHP 7.2; Symfony 4
+      dist: bionic
+      env:
         - PHP_VERSION=7.2
-    - env:
+        - SYMFONY_VERSION=^4.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.2; Symfony 5
+      dist: bionic
+      env:
+        - PHP_VERSION=7.2
+        - SYMFONY_VERSION=^5.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.3; Symfony 3
+      dist: bionic
+      env:
+        - PHP_VERSION=7.3
+        - SYMFONY_VERSION=^3.4
+        - RUN_PHPUNIT=true
+    - name: PHP 7.3; Symfony 4
+      dist: bionic
+      env:
+        - PHP_VERSION=7.3
+        - SYMFONY_VERSION=^4.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.3; Symfony 5
+      dist: bionic
+      env:
         - PHP_VERSION=7.3
+        - SYMFONY_VERSION=^5.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.4; Symfony 3
+      dist: bionic
+      env:
+        - PHP_VERSION=7.4
+        - SYMFONY_VERSION=^3.4
+        - RUN_PHPUNIT=true
+    - name: PHP 7.4; Symfony 4
+      dist: bionic
+      env:
+        - PHP_VERSION=7.4
+        - SYMFONY_VERSION=^4.0
+        - RUN_PHPUNIT=true
+    - name: PHP 7.4; Symfony 5
+      dist: bionic
+      env:
+        - PHP_VERSION=7.4
+        - SYMFONY_VERSION=^5.0
+        - RUN_PHPUNIT=true
+    - name: PHPStan
+      dist: bionic
+      env:
+        - PHP_VERSION=7.4
+        - RUN_PHPSTAN=true
 
 before_install:
   - travis_retry docker pull registry.gitlab.com/grahamcampbell/php:$PHP_VERSION
+  - if [[ ! -z $SYMFONY_VERSION ]]; then docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "symfony/console:${SYMFONY_VERSION}" --no-update -n; fi
 
 install:
   - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION install --no-suggest --prefer-dist -n -o
+  - if [[ ! -z $RUN_PHPSTAN ]]; then travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION bin phpstan install --no-suggest --prefer-dist -n -o; fi
 
 script:
-  - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:$PHP_VERSION --coverage-clover build/logs/clover.xml
+  - if [[ ! -z $RUN_PHPUNIT ]]; then docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:$PHP_VERSION --coverage-clover build/logs/clover.xml; fi
+  - if [[ ! -z $RUN_PHPSTAN ]]; then docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan registry.gitlab.com/grahamcampbell/php:$PHP_VERSION analyse src; fi
 
 after_script:
-  - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint ocular registry.gitlab.com/grahamcampbell/php:$PHP_VERSION code-coverage:upload --format=php-clover build/logs/clover.xml
+  - if [[ ! -z $RUN_PHPUNIT ]]; then travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint ocular registry.gitlab.com/grahamcampbell/php:$PHP_VERSION code-coverage:upload --format=php-clover build/logs/clover.xml; fi
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Graham Campbell <graham@alt-three.com>
+Copyright (c) 2014-2020 Graham Campbell <graham@alt-three.com>
 Copyright (c) 2013-2014 Michael Dowling <mtdowling@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/bin/classpreloader b/bin/classpreloader
@@ -11,10 +11,14 @@
  * file that was distributed with this source code.
  */
 
-if (file_exists($autoloadPath = __DIR__.'/../../autoload.php')) {
-    require_once $autoloadPath;
+if (file_exists(__DIR__.'/../vendor/autoload.php')) {
+    require __DIR__.'/../vendor/autoload.php';
+} elseif (file_exists(__DIR__.'/../../../autoload.php')) {
+    require __DIR__.'/../../../autoload.php';
+} elseif (file_exists(__DIR__.'/../autoload.php')) {
+    require __DIR__.'/../autoload.php';
 } else {
-    require_once __DIR__.'/vendor/autoload.php';
+    throw new RuntimeException('Unable to locate autoload.php file.');
 }
 
 $application = new ClassPreloader\Console\Application();
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "classpreloader/console",
     "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
-    "keywords": ["autoload", "class", "preload"],
+    "keywords": ["autoload", "class", "preload", "preloader"],
     "license": "MIT",
     "authors": [
         {
@@ -13,13 +13,16 @@
             "email": "graham@alt-three.com"
         }
     ],
-    "require":{
-        "php": "^5.6|^7.0",
+    "require": {
+        "php": "^7.0.8",
         "classpreloader/classpreloader": "^4.0",
-        "symfony/console": "^2.3|^3.0|^4.0"
+        "symfony/console": "^3.4|^4.0|^5.0",
+        "symfony/polyfill-ctype": "^1.9"
     },
-    "require-dev":{
-        "phpunit/phpunit": "^5.7|^6.5|^7.5"
+    "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.3",
+        "phpunit/phpunit": "^6.5.10|^7.5.15",
+        "graham-campbell/analyzer": "^2.4.1"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +32,7 @@
     "autoload-dev": {
         "classmap": ["tests/stubs/"]
     },
-    "bin": ["classpreloader.php"],
+    "bin": ["bin/classpreloader"],
     "config": {
         "preferred-install": "dist"
     },
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -0,0 +1,31 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Only booleans are allowed in \\|\\|, int given on the left side\\.$#"
+			count: 1
+			path: src/ConfigResolver.php
+
+		-
+			message: "#^Only booleans are allowed in &&, int given on the right side\\.$#"
+			count: 1
+			path: src/ConfigResolver.php
+
+		-
+			message: "#^Cannot cast array\\<string\\>\\|bool\\|string\\|null to string\\.$#"
+			count: 2
+			path: src/PreCompileCommand.php
+
+		-
+			message: "#^Anonymous function should have native return typehint \"Generator\"\\.$#"
+			count: 1
+			path: src/PreCompileCommand.php
+
+		-
+			message: "#^Only numeric types are allowed in /, int\\|false given on the left side\\.$#"
+			count: 1
+			path: src/PreCompileCommand.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, array\\<string\\>\\|bool\\|string\\|null given\\.$#"
+			count: 2
+			path: src/PreCompileCommand.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,5 @@
+parameters:
+  level: 8
+
+includes:
+  - phpstan-baseline.neon
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,7 +11,6 @@
          processIsolation="true"
          stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          verbose="true"
 >
     <testsuites>
diff --git a/src/Application.php b/src/Application.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of Class Preloader.
  *
@@ -19,7 +21,7 @@
  *
  * This is sets everything up for the CLI.
  */
-class Application extends BaseApplication
+final class Application extends BaseApplication
 {
     /**
      * Create a new application instance.
diff --git a/src/ConfigResolver.php b/src/ConfigResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of Class Preloader.
  *
@@ -12,34 +14,34 @@
 
 namespace ClassPreloader\Console;
 
-use ClassPreloader\Config;
+use ClassPreloader\ClassLoader\Config;
 use InvalidArgumentException;
 
 /**
  * This is the config resolver class.
  */
-class ConfigResolver
+final class ConfigResolver
 {
     /**
      * Get a list of files in order.
      *
-     * @param mixed $config
+     * @param string $config
      *
      * @throws \InvalidArgumentException
      *
-     * @return array
+     * @return string[]
      */
-    public function getFileList($config)
+    public static function getFileList(string $config)
     {
-        if (strpos($config, ',')) {
+        if (strpos($config, ',') !== false) {
             return array_filter(explode(',', $config));
         }
 
-        if (!$this->isAbsolutePath($config)) {
+        if (!self::isAbsolutePath($config)) {
             $config = getcwd().'/'.$config;
         }
 
-        if (!file_exists($config)) {
+        if (!file_exists($config) || !is_readable($config)) {
             throw new InvalidArgumentException(sprintf('Configuration file "%s" does not exist.', $config));
         }
 
@@ -63,7 +65,7 @@ public function getFileList($config)
      *
      * @return bool
      */
-    protected function isAbsolutePath($file)
+    private static function isAbsolutePath($file)
     {
         return strspn($file, '/\\', 0, 1)
             || (strlen($file) > 3 && ctype_alpha($file[0])
diff --git a/src/PreCompileCommand.php b/src/PreCompileCommand.php
diff --git a/tests/AnalysisTest.php b/tests/AnalysisTest.php
diff --git a/tests/CommandTest.php b/tests/CommandTest.php
diff --git a/tests/classlist.php b/tests/classlist.php
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 The MIT License (MIT)
 -Copyright (c) 2014-2019 Graham Campbell <[email protected]>
 +Copyright (c) 2014-2020 Graham Campbell <[email protected]>
 Copyright (c) 2013-2014 Michael Dowling <[email protected]>
 Permission is hereby granted, free of charge, to any person obtaining a copy
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`processIsolation="true"`
`12`	`12`	`stopOnError="false"`
`13`	`13`	`stopOnFailure="false"`
`14`		`- syntaxCheck="true"`
`15`	`14`	`verbose="true"`
`16`	`15`	`>`
`17`	`16`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+declare(strict_types=1);`
	`4`	`+`
`3`	`5`	`/*`
`4`	`6`	`* This file is part of Class Preloader.`
`5`	`7`	`*`
`@@ -19,7 +21,7 @@`
`19`	`21`	`*`
`20`	`22`	`* This is sets everything up for the CLI.`
`21`	`23`	`*/`
`22`		`-class Application extends BaseApplication`
	`24`	`+final class Application extends BaseApplication`
`23`	`25`	`{`
`24`	`26`	`/**`
`25`	`27`	`* Create a new application instance.`