V7 (#317)

* Updated composer

* Fixing tests

* Updated ci tests

* Updated ci tests

* fixed tests migrations

circle.yml

@@ -11,15 +11,7 @@ test:
   override:
     # turn xdebug off
     - mv /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini_disabled
-    - composer require illuminate/support:"5.3.*" --prefer-source --no-interaction
-    # turn xdebug on
-    - mv /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini_disabled /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini
-    - phpunit
-    - rm -rf vendor composer.lock
-    - git checkout -- composer.json
-    # turn xdebug off
-    - mv /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini_disabled
-    - composer require illuminate/support:"5.2.*" illuminate/database:"5.2.*" --prefer-source --no-interaction
+    - composer install --prefer-source --no-interaction
     # turn xdebug on
     - mv /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini_disabled /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini
     - phpunit --coverage-clover=coverage.clover

composer.json

@@ -12,11 +12,11 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~5.1"
+        "illuminate/support": "5.4.*"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.0",
-        "phpunit/phpunit": "~4.0"
+        "orchestra/testbench": "3.4.*",
+        "phpunit/phpunit": "~5.7"
     },
     "autoload": {
         "psr-4": {

tests/TestCoreModelExtension.php

@@ -64,8 +64,8 @@ public function test_it_returns_false_if_exists_and_dirty_and_parent_save_return
     {
         $that = $this;
         $event = App::make('events');
-        $event->listen('eloquent*', function ($model) use ($that) {
-            return get_class($model) == 'Dimsav\Translatable\Test\Model\Country' ? false : true;
+        $event->listen('eloquent*', function ($event, $models) use ($that) {
+            return get_class(reset($models)) == 'Dimsav\Translatable\Test\Model\Country' ? false : true;
         });
 
         $country = Country::find(1);
@@ -78,8 +78,8 @@ public function test_it_returns_false_if_does_not_exist_and_parent_save_returns_
     {
         $that = $this;
         $event = App::make('events');
-        $event->listen('eloquent*', function ($model) use ($that) {
-            return get_class($model) == 'Dimsav\Translatable\Test\Model\Continent' ? false : true;
+        $event->listen('eloquent*', function ($event, $models) use ($that) {
+            return get_class(reset($models)) == 'Dimsav\Translatable\Test\Model\Continent' ? false : true;
         });
 
         $continent = new Continent();

tests/TestsBase.php

@@ -36,13 +36,13 @@ private function makeSureDatabaseExists()
 
     private function makeSureSchemaIsCreated()
     {
-        $migrationsPath = __DIR__.'/migrations';
+        $migrationsPath = '../../../../tests/migrations';
         $artisan = $this->app->make('Illuminate\Contracts\Console\Kernel');
 
         // Makes sure the migrations table is created
         $artisan->call('migrate', [
             '--database' => 'mysql',
-            '--realpath'     => $migrationsPath,
+            '--path'     => $migrationsPath,
         ]);
     }