Merge remote-tracking branch 'origin/master' into laravel

.gitignore

@@ -10,16 +10,29 @@ docker-compose.yml
 phinx.php
 phinx.yml
 
+# IDE Files
+## PHPStorm InteliJ
 *.idea
+
+## Visual Studio
+*.vscode
+
+## Eclipse
+.buildpath
+.project
+.settings
+
+## Vi
 *~
+*.swp
+
 # Vagrant
 /.gitkeep
 /.vagrant
 /deploy
 Vagrantfile
 deploy/.ruby-version
 ieducar/configuration/ieducar.ini
-*.vscode
 ieducar/modules/Reports
 ieducar/intranet/filaunica
 ieducar/intranet/reservavaga

.scrutinizer.yml

@@ -1,39 +1,41 @@
 filter:
   excluded_paths:
-      - 'ieducar/tests/*'
-      - 'ieducar/misc/**/*'
-      - 'ieducar/intranet/scripts/jquery'
-      - 'ieducar/intranet/scripts/scriptaculous'
-      - 'ieducar/intranet/scripts/prototype'
-      - 'ieducar/intranet/scripts/select2'
-      - 'ieducar/intranet/scripts/graficos'
-      - 'ieducar/modules/Portabilis/Assets/Plugins/AjaxChosen/'
-      - 'ieducar/modules/Portabilis/Assets/Plugins/Chosen/'
+    - 'ieducar/tests/*'
+    - 'ieducar/misc/**/*'
+    - 'ieducar/intranet/scripts/jquery'
+    - 'ieducar/intranet/scripts/scriptaculous'
+    - 'ieducar/intranet/scripts/prototype'
+    - 'ieducar/intranet/scripts/select2'
+    - 'ieducar/intranet/scripts/graficos'
+    - 'ieducar/modules/Portabilis/Assets/Plugins/AjaxChosen/'
+    - 'ieducar/modules/Portabilis/Assets/Plugins/Chosen/'
 
 checks:
   php:
     code_rating: true
 
 tools:
-    external_code_coverage: true
-    php_analyzer: true
-    php_changetracking: true
-    php_code_sniffer:
-      config:
-        standard: "PSR2"
-    php_cpd: true
-    php_mess_detector: true
-    php_pdepend: true
-    sensiolabs_security_checker: true
+  php_analyzer: true
+  php_changetracking: true
+  php_code_sniffer:
+    config:
+      standard: "PSR2"
+  php_cpd: true
+  php_mess_detector: true
+  php_pdepend: true
+  sensiolabs_security_checker: true
 
 build:
+
   environment:
     postgresql: true
-
   dependencies:
-    after:
+    before:
       - psql -c "CREATE DATABASE ieducar_test WITH OWNER = scrutinizer ENCODING = 'UTF8' LC_COLLATE = 'en_US.UTF-8' TEMPLATE template0"
+    after:
       - cp phinx.php.scrutinizer phinx.php
-      - vendor/bin/phinx seed:run -s StartingSeed -s StartingForeignKeysSeed
-      - vendor/bin/phinx migrate
-
+      - ieducar/vendor/bin/phinx seed:run -s StartingSeed -s StartingForeignKeysSeed
+      - ieducar/vendor/bin/phinx migrate
+  tests:
+    override:
+      command: "true"

.travis.yml

@@ -8,7 +8,7 @@ matrix:
         postgresql: 9.5
         apt:
           packages:
-          - postgresql-9.5
+            - postgresql-9.5
       cache:
         directories:
           - $HOME/.composer/cache
@@ -18,5 +18,11 @@ matrix:
         - composer install
         - vendor/bin/phinx seed:run -s StartingSeed -s StartingForeignKeysSeed
         - vendor/bin/phinx migrate
+        - sed -i -e '/<log type="coverage-html.*UTF-8"\/>/g' ieducar/phpunit.xml
+        - sed -i -e 's/CORE_EXT_CONFIGURATION_ENV" value="testing/CORE_EXT_CONFIGURATION_ENV" value="travis/g' ieducar/phpunit.xml
+        - sed -i -e 's/API_URI" value="http:\/\/localhost/API_URI" value="http:\/\/localhost:8000/g' ieducar/phpunit.xml
+        - CORE_EXT_CONFIGURATION_ENV=travis php -S localhost:8000 -t ieducar/ &
+      script:
+        - composer test
       after_success:
         - vendor/bin/php-coveralls --verbose