Merge pull request #114 from rodrigolinsr/php-8-laravel-8

PHP 8 & Laravel 8 upgrade

Author: loonytoons

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.3
   - 7.4
+  - 8.0
 
 sudo: false
 

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "illuminate/console": "^8.0",
         "illuminate/filesystem": "^8.0",
         "illuminate/support": "^8.0",
@@ -27,7 +27,7 @@
     "require-dev": {
         "illuminate/database": "^8.0",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,24 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="phpunit.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Laravel Annotations Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Laravel Annotations Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>

src/AnnotationsServiceProvider.php

@@ -8,12 +8,13 @@
 use Collective\Annotations\Database\Eloquent\Annotations\Scanner as ModelScanner;
 use Collective\Annotations\Events\Annotations\Scanner as EventScanner;
 use Collective\Annotations\Routing\Annotations\Scanner as RouteScanner;
-use Illuminate\Container\Container;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 class AnnotationsServiceProvider extends ServiceProvider
 {
+    use DetectsApplicationNamespace;
+
     /**
      * The commands to be registered.
      *
@@ -446,7 +447,7 @@ public function routeScans()
         if ($this->scanControllers) {
             $classes = array_merge(
               $classes,
-              $this->getClassesFromNamespace(Container::getInstance()->getNamespace().'Http\\Controllers')
+              $this->getClassesFromNamespace($this->getAppNamespace().'Http\\Controllers')
             );
         }
 
@@ -477,7 +478,7 @@ public function modelScans()
     public function convertNamespaceToPath($namespace)
     {
         // remove the app namespace from the namespace if it is there
-        $appNamespace = Container::getInstance()->getNamespace();
+        $appNamespace = $this->getAppNamespace();
 
         if (substr($namespace, 0, strlen($appNamespace)) == $appNamespace) {
             $namespace = substr($namespace, strlen($appNamespace));
@@ -510,6 +511,6 @@ public function getClassesFromNamespace($namespace, $base = null)
      */
     protected function getAllClasses()
     {
-        return $this->getClassesFromNamespace(Container::getInstance()->getNamespace());
+        return $this->getClassesFromNamespace($this->getAppNamespace());
     }
 }

src/Console/RouteScanCommand.php

@@ -3,13 +3,15 @@
 namespace Collective\Annotations\Console;
 
 use Collective\Annotations\AnnotationsServiceProvider;
+use Collective\Annotations\DetectsApplicationNamespace;
 use Illuminate\Console\Command;
-use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 
 class RouteScanCommand extends Command
 {
+    use DetectsApplicationNamespace;
+
     /**
      * The console command name.
      *
@@ -99,7 +101,7 @@ protected function getOutputPath()
      */
     protected function getOptions()
     {
-        $namespace = Container::getInstance()->getNamespace().'Http\Controllers';
+        $namespace = $this->getAppNamespace().'Http\Controllers';
 
         return [
           ['namespace', null, InputOption::VALUE_OPTIONAL, 'The root namespace for the controllers.', $namespace],

src/DetectsApplicationNamespace.php

@@ -0,0 +1,24 @@
+<?php
+namespace Collective\Annotations;
+
+use Illuminate\Container\Container;
+
+/**
+ * Trait DetectsApplicationNamespace
+ *
+ * This got deprecated in Laravel 7, so fastest solution would be to just have this here.
+ *
+ * @package Collective\Annotations
+ */
+trait DetectsApplicationNamespace
+{
+    /**
+     * Get the application namespace.
+     *
+     * @return string
+     */
+    protected function getAppNamespace()
+    {
+        return Container::getInstance()->getNamespace();
+    }
+}

src/Filesystem/ClassFinder.php

@@ -110,7 +110,13 @@ protected function tokenIsClassOrInterface($token)
      */
     protected function isPartOfNamespace($token)
     {
-        return is_array($token) && ($token[0] == T_STRING || $token[0] == T_NS_SEPARATOR);
+        /**
+         * T_NAME_QUALIFIED >= PHP 8.0
+         * T_NS_SEPARATOR   <= PHP 8.0
+         */
+        $compare = (defined('T_NAME_QUALIFIED') ? T_NAME_QUALIFIED : T_NS_SEPARATOR);
+
+        return is_array($token) && ($token[0] == T_STRING || $token[0] == $compare);
     }
 
     /**

src/NamespaceToPathConverterTrait.php

@@ -2,11 +2,11 @@
 
 namespace Collective\Annotations;
 
-use Illuminate\Container\Container;
 use Illuminate\Support\Facades\App;
 
 trait NamespaceToPathConverterTrait
 {
+    use DetectsApplicationNamespace;
 
     /**
      * Convert the given namespace to a file path.
@@ -17,7 +17,7 @@ trait NamespaceToPathConverterTrait
      */
     public function getPathFromNamespace($namespace, $base = null)
     {
-        $appNamespace = Container::getInstance()->getNamespace();
+        $appNamespace = $this->getAppNamespace();
 
         // remove the app namespace from the namespace if it is there
         if (substr($namespace, 0, strlen($appNamespace)) == $appNamespace) {

tests/AnnotationsServiceProviderTest.php

@@ -27,7 +27,7 @@ public function setUp(): void
 
     public function testConvertNamespaceToPath()
     {
-        $this->provider = new AnnotationsServiceProviderAppNamespaceStub($this->app);
+        $this->provider = new AnnotationsServiceProvider($this->app);
         $class = 'App\\Foo';
 
         $result = $this->provider->convertNamespaceToPath($class);
@@ -41,7 +41,7 @@ public function testConvertNamespaceToPathWithoutRootNamespace()
             ->andReturn('Foo\\');
         Container::setInstance($this->app);
 
-        $this->provider = new AnnotationsServiceProviderAppNamespaceStub($this->app);
+        $this->provider = new AnnotationsServiceProvider($this->app);
         $class = 'App\\Foo';
 
         $result = $this->provider->convertNamespaceToPath($class);
@@ -53,7 +53,7 @@ public function testGetClassesFromNamespace()
     {
         $this->app->shouldReceive('getNamespace')->once()
             ->andReturn('App\\');
-        $this->provider = new AnnotationsServiceProviderAppNamespaceStub($this->app);
+        $this->provider = new AnnotationsServiceProvider($this->app);
         Container::setInstance($this->app);
 
         $this->app->shouldReceive('make')
@@ -69,13 +69,3 @@ public function testGetClassesFromNamespace()
         $this->assertEquals(['classes'], $results);
     }
 }
-
-class AnnotationsServiceProviderAppNamespaceStub extends AnnotationsServiceProvider
-{
-    public $appNamespace = 'App';
-
-    public function getAppNamespace()
-    {
-        return $this->appNamespace;
-    }
-}