Add laravel 5.4 support (#7)

Add Laravel 5.4 support

Author: Pe Ell

.travis.yml

@@ -1,12 +1,21 @@
 language: php
 
+sudo: false
+
 php:
   - 5.6
   - 7.0
   - 7.1
 
+env:
+  global:
+    - setup=basic
+
 before_script:
-  - travis_retry composer self-update
-  - travis_retry composer install --no-interaction
+  - composer config discard-changes true
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
 
-script: vendor/bin/phpunit --verbose
+script:
+  - ./vendor/bin/phpunit -c phpunit.xml.dist --verbose

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to `laravel-ownership` will be documented in this file.
 
+## 2.2.0 - 2017-02-07
+
+### Added
+
+- `owner()` alias for method `ownedBy`
+- Laravel 5.4 support
+
 ## 2.1.0 - 2016-12-21
 
 ### Added

README.md

@@ -140,12 +140,15 @@ Schema::table('articles', function (Blueprint $table) {
 
 ```php
 $article->ownedBy();
+$article->owner();
 ```
 
 #### Get model owner
 
 ```php
 $article->getOwner();
+$article->ownedBy;
+$article->owner;
 ```
 
 #### Change (set) owner

composer.json

@@ -40,14 +40,15 @@
         "docs": "https://github.com/cybercog/laravel-ownership/wiki"
     },
     "require": {
+        "php": "^5.6|^7.0",
         "illuminate/database": "~5.2.0|~5.3.0|~5.4.0",
-        "illuminate/support": "~5.2.0|~5.3.0|~5.4.0",
-        "php": "^5.6|^7.0"
+        "illuminate/support": "~5.2.0|~5.3.0|~5.4.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.11",
         "mockery/mockery": "^0.9.5",
-        "orchestra/testbench": "~3.0",
+        "orchestra/testbench": "~3.4.0",
+        "orchestra/database": "~3.4.0",
         "phpunit/phpunit": "^5.2"
     },
     "autoload": {
@@ -62,5 +63,7 @@
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable" : true
 }

src/Contracts/HasOwner.php

@@ -28,6 +28,13 @@ interface HasOwner
      */
     public function ownedBy();
 
+    /**
+     * Get the model owner. Alias for `ownedBy()` method.
+     *
+     * @return mixed
+     */
+    public function owner();
+
     /**
      * Get the model owner.
      *

src/Traits/HasMorphOwner.php

@@ -48,6 +48,16 @@ public function ownedBy()
         return $this->morphTo('owned_by');
     }
 
+    /**
+     * Get the model owner. Alias for `ownedBy()` method.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner()
+    {
+        return $this->ownedBy();
+    }
+
     /**
      * Get the model owner.
      *

src/Traits/HasOwner.php

@@ -49,6 +49,16 @@ public function ownedBy()
         return $this->belongsTo($this->getOwnerModel(), $this->getOwnerForeignKey(), $this->getOwnerPrimaryKey());
     }
 
+    /**
+     * Get the model owner. Alias for `ownedBy()` method.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function owner()
+    {
+        return $this->ownedBy();
+    }
+
     /**
      * Get the model owner.
      *

tests/TestCase.php

@@ -30,6 +30,7 @@ protected function setUp()
     {
         parent::setUp();
 
+        $this->registerMigrations();
         $this->migrateUnitTestTables();
         $this->registerPackageFactories();
         $this->registerTestMorphMaps();
@@ -56,21 +57,33 @@ protected function getPackageProviders($app)
     {
         return [
             \Cog\Ownership\Providers\OwnershipServiceProvider::class,
+            \Orchestra\Database\ConsoleServiceProvider::class,
         ];
     }
 
     /**
-     * Perform unit test database migrations.
+     * Register test migrations.
      *
      * @return void
      */
-    protected function migrateUnitTestTables()
+    protected function registerMigrations()
     {
-        $this->artisan('migrate', [
+        $this->loadMigrationsFrom([
+            //'--database' => 'sqlite',
             '--realpath' => realpath(__DIR__ . '/database/migrations'),
         ]);
     }
 
+    /**
+     * Perform unit test database migrations.
+     *
+     * @return void
+     */
+    protected function migrateUnitTestTables()
+    {
+        $this->artisan('migrate');
+    }
+
     /**
      * Register package related model factories.
      *

tests/unit/Traits/HasOwnerTest.php

@@ -17,6 +17,7 @@
 use Cog\Ownership\Tests\Stubs\Models\Character;
 use Cog\Ownership\Tests\Stubs\Models\EntityWithOwner;
 use Cog\Ownership\Tests\Stubs\Models\EntityWithDefaultOwner;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
  * Class HasOwnerTest.
@@ -25,6 +26,28 @@
  */
 class HasOwnerTest extends TestCase
 {
+    /** @test */
+    public function it_can_get_owner_relation()
+    {
+        $user = factory(User::class)->create();
+        $entity = factory(EntityWithOwner::class)->create([
+            'owned_by' => $user->getKey(),
+        ]);
+
+        $this->assertInstanceOf(BelongsTo::class, $entity->ownedBy());
+    }
+
+    /** @test */
+    public function it_can_get_owner_relation_using_alias()
+    {
+        $user = factory(User::class)->create();
+        $entity = factory(EntityWithOwner::class)->create([
+            'owned_by' => $user->getKey(),
+        ]);
+
+        $this->assertInstanceOf(BelongsTo::class, $entity->owner());
+    }
+
     /** @test */
     public function it_can_belong_to_owner()
     {
@@ -36,6 +59,17 @@ public function it_can_belong_to_owner()
         $this->assertInstanceOf(User::class, $entity->ownedBy);
     }
 
+    /** @test */
+    public function it_can_belong_to_owner_using_alias()
+    {
+        $user = factory(User::class)->create();
+        $entity = factory(EntityWithOwner::class)->create([
+            'owned_by' => $user->getKey(),
+        ]);
+
+        $this->assertInstanceOf(User::class, $entity->owner);
+    }
+
     /** @test */
     public function it_can_get_owner()
     {