Merge pull request #115 from iyzoer/v3.1.0-aplha

V3.1.0 aplha

.travis.yml

@@ -3,8 +3,8 @@ language: php
 sudo: false
 
 php:
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
@@ -39,4 +39,4 @@ deploy:
   on:
     php: 7.1
     branch: master
-    condition: "$DEPLOY = true"
+    condition: "$DEPLOY = false"

RoboFile.php

@@ -73,9 +73,12 @@ public function opencartSetup()
         $this->taskDeleteDir('www')->run();
         $this->taskFileSystemStack()
             ->mirror('vendor/opencart/opencart/upload', 'www')
-            ->copy('vendor/beyondit/opencart-test-suite/src/upload/system/config/test-config.php','www/system/config/test-config.php')
-            ->copy('vendor/beyondit/opencart-test-suite/src/upload/catalog/controller/startup/test_startup.php','www/catalog/controller/startup/test_startup.php')
+            ->copy('tests/test-config.php', 'www/system/config/test-config.php')
+            ->copy('vendor/beyondit/opencart-test-suite/src/upload/system/library/session/test.php', 'www/system/library/session/test.php')
+            ->copy('vendor/beyondit/opencart-test-suite/src/upload/admin/controller/startup/test_startup.php','www/admin/controller/startup/test_startup.php')
             ->chmod('www', 0777, 0000, true)
+            ->rename('www/config-dist.php', 'www/config.php')
+            ->rename('www/admin/config-dist.php', 'www/admin/config.php')
             ->run();
 
         // Create new database, drop if exists already
@@ -97,7 +100,9 @@ public function opencartSetup()
         $install->run();
         $this->taskDeleteDir('www/install')->run();
 
-        $this->restoreSampleData($conn);
+        if (isset($conn)) {
+            $this->restoreSampleData($conn);
+        }
 
         $conn = null;
     }

VERSION

@@ -1 +1 @@
-3.1.2
+3.1.0-alpha1

composer.json

@@ -9,11 +9,12 @@
             "email": "[email protected]"
         }
     ],
+    "version": "3.1.0-alpha1",
     "require-dev": {
-      "opencart/opencart" : "2.3.0.2",
+      "opencart/opencart" : "3.1.0.0_a1",
       "vlucas/phpdotenv": "~1.1.0",
-      "phpunit/phpunit" : "~4.0",
-      "beyondit/opencart-test-suite": "~2.3.0",
+      "phpunit/phpunit" : "^6",
+      "beyondit/opencart-test-suite": "~3.0",
       "consolidation/robo": "~1",
       "henrikbjorn/lurker": "^1.2"
     },
@@ -25,9 +26,11 @@
       "opencart-dir" : "www"
     },
     "scripts" : {
+      "test-library": "bin/phpunit --testsuite library-tests --colors=always",
       "test-admin": "bin/phpunit --testsuite admin-tests --colors=always",
       "test-catalog": "bin/phpunit --testsuite catalog-tests --colors=always",
       "test": [
+        "@test-library",
         "@test-admin",
         "@test-catalog"
       ],