Add Laravel 5.4 support (#13)

* Add laravel 5.4 support

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-likeable` will be documented in this file.
 
+## 2.1.0 - 2017-02-20
+
+### Added
+
+- Laravel 5.4 support.
+
 ## 2.0.1 - 2017-01-11
 
 - Removed unused properties in `LikeObserver` #12
@@ -32,3 +38,10 @@ All notable changes to `laravel-likeable` will be documented in this file.
 ## 1.0.0 - 2016-09-06
 
 - Initial release
+
+[2.1.0]: https://github.com/cybercog/laravel-likeable/compare/2.0.1...2.1.0
+[2.0.1]: https://github.com/cybercog/laravel-likeable/compare/2.0.0...2.0.1
+[2.0.0]: https://github.com/cybercog/laravel-likeable/compare/1.1.2...2.0.0
+[1.1.2]: https://github.com/cybercog/laravel-likeable/compare/1.1.1...1.1.2
+[1.1.1]: https://github.com/cybercog/laravel-likeable/compare/1.1.0...1.1.1
+[1.1.0]: https://github.com/cybercog/laravel-likeable/compare/1.0.0...1.1.0

README.md

@@ -355,6 +355,7 @@ Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed re
 - [rtconner/laravel-likeable](https://github.com/rtconner/laravel-likeable)
 - [faustbrian/laravel-likeable](https://github.com/faustbrian/Laravel-Likeable)
 - [sukohi/evaluation](https://github.com/SUKOHI/Evaluation)
+- [zvermafia/lavoter](https://github.com/zvermafia/lavoter)
 
 *Feel free to add more alternatives as Pull Request.*
 

composer.json

@@ -1,6 +1,8 @@
 {
     "name": "cybercog/laravel-likeable",
     "description": "Trait for Laravel Eloquent models to allow easy implementation of a `like` & `dislike` features.",
+    "type": "library",
+    "license": "MIT",
     "keywords": [
         "trait",
         "laravel",
@@ -22,18 +24,25 @@
             "role": "Developer"
         }
     ],
-    "license": "BSD-3-Clause",
-    "type": "library",
+    "homepage": "https://github.com/cybercog/laravel-likeable",
+    "support": {
+        "email": "[email protected]",
+        "issues": "https://github.com/cybercog/laravel-likeable/issues",
+        "wiki": "https://github.com/cybercog/laravel-likeable/wiki",
+        "source": "https://github.com/cybercog/laravel-likeable",
+        "docs": "https://github.com/cybercog/laravel-likeable/wiki"
+    },
     "require": {
-        "php": "^5.6|^7.0",
-        "illuminate/database": "~5.1.20|~5.2.0|~5.3.0",
-        "illuminate/support": "~5.1.20|~5.2.0|~5.3.0"
+        "illuminate/database": "~5.1.20|~5.2.0|~5.3.0|~5.4.0",
+        "illuminate/support": "~5.1.20|~5.2.0|~5.3.0|~5.4.0",
+        "php": "^5.6|^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.2",
-        "orchestra/testbench": "~3.0",
-        "mockery/mockery": "~0.9",
-        "friendsofphp/php-cs-fixer": "^1.11"
+        "friendsofphp/php-cs-fixer": "^1.11",
+        "mockery/mockery": "^0.9.5",
+        "orchestra/database": "~3.4.0",
+        "orchestra/testbench": "~3.4.0",
+        "phpunit/phpunit": "^5.7"
     },
     "autoload": {
         "psr-4": {
@@ -44,5 +53,10 @@
         "psr-4": {
             "Cog\\Likeable\\Tests\\": "tests/"
         }
-    }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable" : true
 }

phpunit.xml.dist

@@ -13,8 +13,8 @@
         >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-            <exclude>./tests/factories/</exclude>
+            <directory suffix=".php">tests/</directory>
+            <exclude>tests/database/factories/</exclude>
         </testsuite>
     </testsuites>
     <php>

tests/TestCase.php

@@ -12,8 +12,8 @@
 namespace Cog\Likeable\Tests;
 
 use Cog\Likeable\Tests\Stubs\Models\EntityWithMorphMap;
-use File;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Facades\File;
 use Mockery;
 use Orchestra\Testbench\TestCase as Orchestra;
 
@@ -24,17 +24,30 @@
  */
 abstract class TestCase extends Orchestra
 {
+    /**
+     * Register a callback to be run before the application is destroyed.
+     * TODO: Remove it when will be pushed to Orchestra Testbench package.
+     *
+     * @param  callable  $callback
+     *
+     * @return void
+     */
+    protected function beforeApplicationDestroyed(callable $callback)
+    {
+        array_unshift($this->beforeApplicationDestroyedCallbacks, $callback);
+    }
+
     /**
      * Actions to be performed on PHPUnit start.
      */
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 
         $this->destroyPackageMigrations();
         $this->publishPackageMigrations();
-        $this->migrateUnitTestTables();
         $this->migratePackageTables();
+        $this->migrateUnitTestTables();
         $this->registerPackageFactories();
         $this->registerTestMorphMaps();
     }
@@ -56,6 +69,7 @@ protected function getPackageProviders($app)
     {
         return [
             \Cog\Likeable\Providers\LikeableServiceProvider::class,
+            \Orchestra\Database\ConsoleServiceProvider::class,
         ];
     }
 
@@ -80,8 +94,9 @@ protected function destroyPackageMigrations()
      */
     protected function migrateUnitTestTables()
     {
-        $this->artisan('migrate', [
-            '--realpath' => realpath(__DIR__ . '/migrations'),
+        $this->loadMigrationsFrom([
+            //'--database' => 'sqlite',
+            '--realpath' => realpath(__DIR__ . '/database/migrations'),
         ]);
     }
 
@@ -90,7 +105,8 @@ protected function migrateUnitTestTables()
      */
     protected function migratePackageTables()
     {
-        $this->artisan('migrate', [
+        $this->loadMigrationsFrom([
+            //'--database' => 'sqlite',
             '--realpath' => database_path('migrations'),
         ]);
     }
@@ -100,7 +116,7 @@ protected function migratePackageTables()
      */
     protected function registerPackageFactories()
     {
-        $pathToFactories = realpath(__DIR__ . '/factories');
+        $pathToFactories = realpath(__DIR__ . '/database/factories');
         $this->withFactories($pathToFactories);
     }
 

tests/unit/Console/LikeableRecountCommandTest.php

@@ -470,6 +470,9 @@ public function it_can_recount_model_all_like_types_with_morph_map_using_full_cl
     /** @test */
     public function it_can_throw_model_invalid_exception_on_not_exist_morph_map()
     {
+        // TODO: Check if works on older Laravel versions. Otherwise uncomment assertContains on the end.
+        $this->expectException(\Cog\Likeable\Exceptions\ModelInvalidException::class);
+
         $status = $this->kernel->handle(
             $input = new ArrayInput([
                 'command' => 'likeable:recount',
@@ -479,12 +482,15 @@ public function it_can_throw_model_invalid_exception_on_not_exist_morph_map()
         );
 
         $this->assertEquals(1, $status);
-        $this->assertContains('Cog\Likeable\Exceptions\ModelInvalidException', $output->fetch());
+        //$this->assertContains('Cog\Likeable\Exceptions\ModelInvalidException', $output->fetch());
     }
 
     /** @test */
     public function it_can_throw_model_invalid_exception_if_class_not_implemented_has_likes_interface()
     {
+        // TODO: Check if works on older Laravel versions. Otherwise uncomment assertContains on the end.
+        $this->expectException(\Cog\Likeable\Exceptions\ModelInvalidException::class);
+
         $status = $this->kernel->handle(
             $input = new ArrayInput([
                 'command' => 'likeable:recount',
@@ -494,7 +500,7 @@ public function it_can_throw_model_invalid_exception_if_class_not_implemented_ha
         );
 
         $this->assertEquals(1, $status);
-        $this->assertContains('Cog\Likeable\Exceptions\ModelInvalidException', $output->fetch());
+        //$this->assertContains('Cog\Likeable\Exceptions\ModelInvalidException', $output->fetch());
     }
 
     public function it_deletes_records_before_recount()