Merge pull request #67 from boxfrommars/travis-memory-limit-fix

Fix dependency issue
boxfrommars · Nov 27, 2018 · 6c44903 · 6c44903
2 parents a8b7de5 + 7c19dea
commit 6c44903
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ php:
   - 7.1
   - 7.2
 
+before_install:
+  - echo "memory_limit=3000M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
 before_script:
   - composer self-update
   - composer install --prefer-source --no-interaction

diff --git a/README.md b/README.md
@@ -22,7 +22,8 @@ composer require rutorika/sortable
  4        | 1.2.x (branch laravel4)
  <=5.3    | 3.2.x
  5.4      | 3.4.x
- 5.5      | 4.x.x
+ 5.5      | 4.2.x
+ 5.7      | 4.7.x
 
 ## Sortable Trait
 

diff --git a/composer.json b/composer.json
@@ -14,9 +14,8 @@
         "illuminate/support": ">=5.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.3",
-        "orchestra/testbench": "3.5.*",
-        "orchestra/database": "~3.1"
+        "phpunit/phpunit": "~7",
+        "orchestra/testbench": "~3.7"
     },
     "autoload": {
         "psr-0": {

diff --git a/tests/SortableControllerSpecificDatabaseTest.php b/tests/SortableControllerSpecificDatabaseTest.php
@@ -398,9 +398,4 @@ public function invalidM2mParamsProvider()
             ],
         ];
     }
-
-    protected function getPackageProviders($app)
-    {
-        return ['Orchestra\Database\ConsoleServiceProvider'];
-    }
 }
diff --git a/tests/SortableControllerTest.php b/tests/SortableControllerTest.php
@@ -398,9 +398,4 @@ public function invalidM2mParamsProvider()
             ],
         ];
     }
-
-    protected function getPackageProviders($app)
-    {
-        return ['Orchestra\Database\ConsoleServiceProvider'];
-    }
 }
diff --git a/tests/SortableTestBase.php b/tests/SortableTestBase.php
@@ -34,9 +34,4 @@ protected function getEnvironmentSetUp($app)
             ]
         );
     }
-
-    protected function getPackageProviders($app)
-    {
-        return ['Orchestra\Database\ConsoleServiceProvider'];
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -398,9 +398,4 @@ public function invalidM2mParamsProvider() @@
                 ],
             ];
         }
-        protected function getPackageProviders($app)
-        {
-            return ['Orchestra\Database\ConsoleServiceProvider'];
-        }
     }