[Laravel 6] Bring code to a state where unit tests pass

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        phpVersions: ['7.1', '7.2', '7.3']
+        phpVersions: ['7.2', '7.3', '7.4']
       fail-fast: false
     name: PHP ${{ matrix.phpVersions }}
     steps:

.gitignore

@@ -1,6 +1,12 @@
+# Composer files
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+
+# Editor files
 .idea
+.vscode
+
+# Other files
+.DS_Store
 php_errors.log

composer.json

@@ -21,11 +21,10 @@
     "require": {
         "php": "^7.2",
         "doctrine/dbal": "^2.6",
-        "erusev/parsedown-extra": "~0.7",
-        "kriswallsmith/assetic": "~1.3",
+        "erusev/parsedown-extra": "~0.8",
+        "assetic/framework": "dev-2.0/dev",
         "linkorb/jsmin-php": "~1.0",
-        "leafo/scssphp": "~0.6",
-        "symfony/yaml": "^4.0",
+        "symfony/yaml": "^3.4",
         "twig/twig": "~2.0",
         "league/csv": "~8.0",
         "jenssegers/date": "~3.0",
@@ -34,20 +33,21 @@
         "fideloper/proxy": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "illuminate/database": "dev-master",
-        "illuminate/filesystem": "dev-master",
-        "illuminate/queue": "dev-master",
-        "illuminate/support": "dev-master",
-        "illuminate/log": "dev-master",
-        "illuminate/mail": "dev-master",
-        "illuminate/events": "dev-master",
-        "illuminate/pagination": "dev-master",
-        "illuminate/routing": "dev-master",
-        "illuminate/validation": "dev-master",
-        "illuminate/view": "dev-master",
-        "illuminate/cache": "dev-master",
-        "meyfa/phpunit-assert-gd": "1.1.0",
+        "phpunit/phpunit": "^8.0|^9.0",
+        "dms/phpunit-arraysubset-asserts": "^0.1.0",
+        "illuminate/database": "^6.0",
+        "illuminate/filesystem": "^6.0",
+        "illuminate/queue": "^6.0",
+        "illuminate/support": "^6.0",
+        "illuminate/log": "^6.0",
+        "illuminate/mail": "^6.0",
+        "illuminate/events": "^6.0",
+        "illuminate/pagination": "^6.0",
+        "illuminate/routing": "^6.0",
+        "illuminate/validation": "^6.0",
+        "illuminate/view": "^6.0",
+        "illuminate/cache": "^6.0",
+        "meyfa/phpunit-assert-gd": "^2.0.0",
         "squizlabs/php_codesniffer": "3.*",
         "jakub-onderka/php-parallel-lint": "^1.0"
     },

src/Database/Attach/File.php

@@ -447,7 +447,7 @@ public function sizeToString()
 
     /**
      * Before the model is saved
-     * - check if new file data has been supplied, eg: $model->data = Input::file('something');
+     * - check if new file data has been supplied, eg: $model->data = Request::file('something');
      */
     public function beforeSave()
     {

src/Database/Attach/Resizer.php

@@ -12,7 +12,7 @@
  *          ->save(string 'path/to/file.jpg', int $quality);
  *
  *      // Resize and save an image.
- *      Resizer::open(Input::file('field_name'))
+ *      Resizer::open(Request::file('field_name'))
  *          ->resize(800, 600, 'crop')
  *          ->save('path/to/file.jpg', 100);
  *
@@ -72,7 +72,7 @@ class Resizer
 
     /**
      * Instantiates the Resizer and receives the path to an image we're working with
-     * @param mixed $file The file array provided by Laravel's Input::file('field_name') or a path to a file
+     * @param mixed $file The file array provided by Laravel's Request::file('field_name') or a path to a file
      * @throws Exception
      */
     public function __construct($file)
@@ -107,7 +107,7 @@ public function __construct($file)
     /**
      * Static call, Laravel style.
      * Returns a new Resizer object, allowing for chainable calls
-     * @param  mixed $file The file array provided by Laravel's Input::file('field_name') or a path to a file
+     * @param  mixed $file The file array provided by Laravel's Request::file('field_name') or a path to a file
      * @return Resizer
      * @throws Exception
      */

src/Database/Concerns/HasRelationships.php

@@ -110,7 +110,20 @@ trait HasRelationships
     /**
      * @var array Excepted relationship types, used to cycle and verify relationships.
      */
-    protected static $relationTypes = ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany', 'morphTo', 'morphOne', 'morphMany', 'morphToMany', 'morphedByMany', 'attachOne', 'attachMany', 'hasManyThrough'];
+    protected static $relationTypes = [
+        'hasOne',
+        'hasMany',
+        'belongsTo',
+        'belongsToMany',
+        'morphTo',
+        'morphOne',
+        'morphMany',
+        'morphToMany',
+        'morphedByMany',
+        'attachOne',
+        'attachMany',
+        'hasManyThrough'
+    ];
 
 
     //
@@ -416,7 +429,7 @@ public function belongsTo($related, $foreignKey = null, $parentKey = null, $rela
      * Overridden from {@link Eloquent\Model} to allow the usage of the intermediary methods to handle the relation.
      * @return \October\Rain\Database\Relations\BelongsTo
      */
-    public function morphTo($name = null, $type = null, $id = null)
+    public function morphTo($name = null, $type = null, $id = null, $ownerKey = null)
     {
         if (is_null($name)) {
             $name = $this->getRelationCaller();
@@ -425,8 +438,8 @@ public function morphTo($name = null, $type = null, $id = null)
         list($type, $id) = $this->getMorphs(Str::snake($name), $type, $id);
 
         return empty($class = $this->{$type})
-                    ? $this->morphEagerTo($name, $type, $id)
-                    : $this->morphInstanceTo($class, $name, $type, $id);
+                    ? $this->morphEagerTo($name, $type, $id, $ownerKey)
+                    : $this->morphInstanceTo($class, $name, $type, $id, $ownerKey);
     }
 
     /**
@@ -435,15 +448,16 @@ public function morphTo($name = null, $type = null, $id = null)
      * @param  string  $name
      * @param  string  $type
      * @param  string  $id
+     * @param  string  $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    protected function morphEagerTo($name, $type, $id)
+    protected function morphEagerTo($name, $type, $id, $ownerKey)
     {
         return new MorphTo(
             $this->newQuery()->setEagerLoads([]),
             $this,
             $id,
-            null,
+            $ownerKey,
             $type,
             $name
         );
@@ -456,9 +470,10 @@ protected function morphEagerTo($name, $type, $id)
      * @param  string  $name
      * @param  string  $type
      * @param  string  $id
+     * @param  string  $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    protected function morphInstanceTo($target, $name, $type, $id)
+    protected function morphInstanceTo($target, $name, $type, $id, $ownerKey)
     {
         $instance = $this->newRelatedInstance(
             static::getActualClassNameForMorph($target)
@@ -468,7 +483,7 @@ protected function morphInstanceTo($target, $name, $type, $id)
             $instance->newQuery(),
             $this,
             $id,
-            $instance->getKeyName(),
+            $ownerKey ?? $instance->getKeyName(),
             $type,
             $name
         );

src/Database/Relations/MorphTo.php

@@ -13,11 +13,11 @@ class MorphTo extends MorphToBase
      */
     protected $relationName;
 
-    public function __construct(Builder $query, Model $parent, $foreignKey, $otherKey, $type, $relationName)
+    public function __construct(Builder $query, Model $parent, $foreignKey, $ownerKey, $type, $relationName)
     {
         $this->relationName = $relationName;
 
-        parent::__construct($query, $parent, $foreignKey, $otherKey, $type, $relationName);
+        parent::__construct($query, $parent, $foreignKey, $ownerKey, $type, $relationName);
 
         $this->addDefinedConstraints();
     }

src/Database/Traits/Validation.php

@@ -2,7 +2,7 @@
 
 use App;
 use Lang;
-use Input;
+use Request;
 use October\Rain\Database\ModelException;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Facades\Validator;
@@ -312,8 +312,8 @@ public function validate($rules = null, $customMessages = null, $attributeNames
             }
             else {
                 $this->validationErrors = $validator->messages();
-                if (Input::hasSession()) {
-                    Input::flash();
+                if (Request::hasSession()) {
+                    Request::flash();
                 }
             }
         }

src/Foundation/Bootstrap/LoadEnvironmentVariables.php

@@ -18,7 +18,7 @@ public function bootstrap(Application $app)
         $this->checkForSpecificEnvironmentFile($app);
 
         try {
-            (new Dotenv($app->environmentPath(), $app->environmentFile()))->load();
+            DotEnv::create($app->environmentPath(), $app->environmentFile())->load();
         }
         catch (InvalidPathException $e) {
             //

src/Halcyon/MemoryRepository.php

@@ -47,18 +47,18 @@ public function get($key, $default = null)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|int  $seconds
      * @return void
      */
-    public function put($key, $value, $minutes = null)
+    public function put($key, $value, $seconds = null)
     {
         if (is_array($key)) {
             $this->putMany($key, $value);
         }
 
-        if (!is_null($minutes = $this->getMinutes($minutes))) {
+        if (!is_null($seconds = $this->getSeconds($seconds))) {
             $this->putInMemoryCache($key, $value);
-            parent::put($key, $value, $minutes);
+            parent::put($key, $value, $seconds);
         }
     }
 

src/Halcyon/Traits/Validation.php

@@ -1,7 +1,7 @@
 <?php namespace October\Rain\Halcyon\Traits;
 
 use Illuminate\Support\MessageBag;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Validator;
 use October\Rain\Halcyon\Exception\ModelException;
 use Exception;
@@ -204,14 +204,14 @@ public function validate($rules = null, $customMessages = null, $attributeNames
                 $this->validationErrors = $validator->messages();
 
                 /*
-                 * Flash input, if available
+                 * Flash request, if available
                  */
                 if (
-                    ($input = Input::getFacadeRoot()) &&
-                    method_exists($input, 'hasSession') &&
-                    $input->hasSession()
+                    ($request = Request::getFacadeRoot()) &&
+                    method_exists($request, 'hasSession') &&
+                    $request->hasSession()
                 ) {
-                    $input->flash();
+                    $request->flash();
                 }
             }
         }

src/Parse/Assetic/FilesystemCache.php

@@ -1,7 +1,7 @@
 <?php namespace October\Rain\Parse\Assetic;
 
 use File;
-use Assetic\Cache\CacheInterface;
+use Assetic\Contracts\Cache\CacheInterface;
 use RuntimeException;
 
 /**

src/Parse/Assetic/JavascriptImporter.php

@@ -1,8 +1,8 @@
 <?php namespace October\Rain\Parse\Assetic;
 
 use File;
-use Assetic\Asset\AssetInterface;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Asset\AssetInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 use RuntimeException;
 
 /**

src/Parse/Assetic/LessCompiler.php

@@ -1,13 +1,12 @@
 <?php namespace October\Rain\Parse\Assetic;
 
-use Event;
 use Less_Parser;
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use Assetic\Factory\AssetFactory;
 use Assetic\Filter\LessphpFilter;
-use Assetic\Filter\HashableInterface;
-use Assetic\Filter\DependencyExtractorInterface;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Filter\HashableInterface;
+use Assetic\Contracts\Filter\DependencyExtractorInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 
 /**
  * Less.php Compiler Filter

src/Parse/Assetic/ScssCompiler.php

@@ -1,12 +1,11 @@
 <?php namespace October\Rain\Parse\Assetic;
 
 use Event;
-use Assetic\Asset\AssetInterface;
+use Assetic\Contracts\Asset\AssetInterface;
 use Assetic\Factory\AssetFactory;
-use Assetic\Filter\ScssphpFilter;
-use Assetic\Filter\HashableInterface;
-use Assetic\Filter\DependencyExtractorInterface;
-use Assetic\Filter\FilterInterface;
+use Assetic\Filter\ScssFilter;
+use Assetic\Contracts\Filter\HashableInterface;
+use Assetic\Contracts\Filter\DependencyExtractorInterface;
 
 /**
  * Less.php Compiler Filter
@@ -15,7 +14,7 @@
  * @package october/parse
  * @author Alexey Bobkov, Samuel Georges
  */
-class ScssCompiler extends ScssphpFilter implements HashableInterface, DependencyExtractorInterface
+class ScssCompiler extends ScssFilter implements HashableInterface, DependencyExtractorInterface
 {
     protected $currentFiles = [];
 

src/Parse/Assetic/StylesheetMinify.php

@@ -1,7 +1,7 @@
 <?php namespace October\Rain\Parse\Assetic;
 
-use Assetic\Asset\AssetInterface;
-use Assetic\Filter\FilterInterface;
+use Assetic\Contracts\Asset\AssetInterface;
+use Assetic\Contracts\Filter\FilterInterface;
 
 /**
  * Minify CSS Filter

src/Support/Facade.php

@@ -19,6 +19,7 @@ protected static function resolveFacadeInstance($name)
     {
         if (
             !is_object($name) &&
+            !is_null(static::$app) &&
             !static::$app->bound($name) &&
             ($instance = static::getFacadeInstance()) !== null
         ) {