Merge branch 'master' of https://github.com/edyan/neuralyzer

Author: edyan

.circleci/config.yml

@@ -7,12 +7,12 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/php:7.1.5-browsers
-      
+      - image: circleci/php:7.1-browsers
+
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mysql:9.4
+      - image: circleci/postgres:10-alpine-ram
 
     working_directory: ~/repo
 
@@ -32,6 +32,10 @@ jobs:
           paths:
             - ./vendor
           key: v1-dependencies-{{ checksum "composer.json" }}
-        
+
       # run tests!
-      - run: phpunit
+      - run:
+          name: Run tests
+          command: vendor/bin/phpunit
+          environment:
+              DB_DRIVER: postgres

RoboFile.php

@@ -221,6 +221,10 @@ private function createSQLServerDB()
 
     private function startPHP(string $version, string $dbType)
     {
+        if (!in_array($version, ['7.1', '7.2'])) {
+            throw new \InvalidArgumentException('PHP Version must be 7.1 or 7.2');
+        }
+
         $dbUser = 'root';
         if ($dbType === 'postgres') {
             $dbUser = 'postgres';
@@ -289,7 +293,7 @@ private function gitVerifyBranchIsUpToDate()
                               ->silent(true)
                               ->exec('fetch --dry-run')
                               ->run();
-        if ($modifiedFiles->getMessage() !== 'Is Up ToDate') {
+        if (!empty($modifiedFiles->getMessage())) {
             throw new \RuntimeException('Your local repo is not up to date, run "git pull"');
         }
     }

phpunit.xml.dist

@@ -7,7 +7,7 @@
     stopOnFailure="true"
     syntaxCheck="true">
     <php>
-        <env name='DB_DRIVER' value='pdo_mysql'/>
+        <env name='DB_DRIVER' value='mysql'/>
         <env name='DB_USER' value='root'/>
         <env name='DB_PASSWORD' value=''/>
         <env name='DB_HOST' value='127.0.0.1'/>