Merge branch 'release/4.0.0'

Author: sebastiaanluca

.travis.yml

@@ -13,6 +13,8 @@ env:
   matrix:
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-lowest"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-stable"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
 
@@ -34,13 +36,9 @@ install:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 
 script:
+  - vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
   - vendor/bin/phpunit
 
-branches:
-  only:
-    - master
-    - develop
-
 notifications:
   email:
     on_failure: change

CHANGELOG.md

@@ -4,7 +4,11 @@ All Notable changes to `sebastiaanluca/laravel-auto-morph-map` will be documente
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## Unreleased
+## 4.0.0 (2019-09-06)
+
+### Added
+
+- Added support for Laravel 6.0
 
 ## 3.0.0 (2019-03-01)
 

composer.json

@@ -23,13 +23,14 @@
     ],
     "require": {
         "php": "^7.2",
-        "laravel/framework": "5.8.*"
+        "laravel/framework": "5.8.*|^6.0"
     },
     "require-dev": {
         "kint-php/kint": "^3.0",
-        "mockery/mockery": "^1.2.2",
-        "orchestra/testbench": "3.8.*",
-        "phpunit/phpunit": "^8.2"
+        "mockery/mockery": "^1.2",
+        "orchestra/testbench": "3.8.*|^4.0",
+        "phpunit/phpunit": "^8.3",
+        "sebastiaanluca/php-codesniffer-ruleset": "^0.4.2"
     },
     "autoload": {
         "psr-4": {
@@ -55,6 +56,9 @@
         }
     },
     "scripts": {
+        "composer-validate": "@composer validate --no-check-all --strict --ansi",
+        "codesniffer-check": "vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1",
+        "codesniffer-fix": "vendor/bin/phpcbf --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 || exit 0",
         "test": "vendor/bin/phpunit",
         "test-lowest": [
             "composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
@@ -63,6 +67,13 @@
         "test-stable": [
             "composer update --prefer-stable --prefer-dist --no-interaction --ansi",
             "@test"
+        ],
+        "check": [
+            "@composer-validate",
+            "@codesniffer-check",
+            "@test"
         ]
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/auto-morph-map.php

@@ -9,19 +9,22 @@
      * The naming scheme to use when determining the model's morph type
      * base value. Defaults to singular table name.
      */
+
     'naming' => NamingSchemes::SINGULAR_TABLE_NAME,
 
     /**
      * The case type to use when aliasing a model. Defaults to use snake case.
      */
+
     'case' => CaseTypes::SNAKE_CASE,
 
     /**
      * If you wish, you can override the naming and conversion altogether
      * using a closure.
      */
-    //    'conversion' => function (string $model) {
-    //        return snake_case(basename($model));
-    //    },
+
+    // 'conversion' => function (string $model) {
+    //     return snake_case(basename($model));
+    // },
 
 ];

phpcs.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+
+    <file>./src</file>
+    <file>./tests</file>
+
+    <rule ref="./vendor/sebastiaanluca/php-codesniffer-ruleset/ruleset.xml"/>
+</ruleset>

src/Commands/CacheMorphMap.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\AutoMorphMap\Commands;
 
 use Illuminate\Console\Command;

src/Commands/ClearCachedMorphMap.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\AutoMorphMap\Commands;
 
 use Illuminate\Console\Command;

src/Mapper.php

@@ -47,10 +47,9 @@ public function getCachePath() : string
     public function getModels() : array
     {
         $config = $this->getComposerConfig();
-
         $paths = $this->getModelPaths($config);
 
-        if (empty($paths)) {
+        if (count($paths) === 0) {
             return [];
         }
 
@@ -82,7 +81,7 @@ protected function useCache() : bool
             return false;
         }
 
-        $this->mapModels(require $cache);
+        $this->mapModels(include $cache);
 
         return true;
     }
@@ -129,11 +128,13 @@ protected function scan(array $paths) : array
 
         foreach ($paths as $namespace => $path) {
             foreach ((new Finder)->in($path)->files() as $file) {
-                $model = $namespace . str_replace(
-                        ['/', '.php'],
-                        ['\\', ''],
-                        Str::after($file->getPathname(), $path . DIRECTORY_SEPARATOR)
-                    );
+                $name = str_replace(
+                    ['/', '.php'],
+                    ['\\', ''],
+                    Str::after($file->getPathname(), $path . DIRECTORY_SEPARATOR)
+                );
+
+                $model = $namespace . $name;
 
                 if (! class_exists($model)) {
                     continue;
@@ -154,14 +155,16 @@ protected function scan(array $paths) : array
 
     /**
      * @param array $map
+     *
+     * @return void
      */
     protected function mapModels(array $map) : void
     {
         $existing = Relation::morphMap() ?: [];
 
-        if (! empty($existing)) {
+        if (count($existing) > 0) {
             $map = collect($map)
-                ->reject(function (string $class, string $alias) use ($existing) {
+                ->reject(function (string $class, string $alias) use ($existing) : bool {
                     return array_key_exists($alias, $existing) || in_array($class, $existing, true);
                 })
                 ->toArray();

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\AutoMorphMap\Tests;
 
 use Illuminate\Filesystem\Filesystem;

tests/resources/cache.php

@@ -1,4 +1,4 @@
-<?php return array (
-  "something_inherited" => 'App\\Models\\SomethingInherited',
-  "different_package" => 'MyPackage\\Models\\Sub\\Package',
-);
+<?php return [
+    'something_inherited' => 'App\\Models\\SomethingInherited',
+    'different_package' => 'MyPackage\\Models\\Sub\\Package',
+];