Migrate for travis

propelorm · Dec 10, 2015 · 56d4e98 · 56d4e98
1 parent 4360dc3
commit 56d4e98
Show file tree

Hide file tree

Showing 20 changed files with 387 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,35 +4,164 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
+  - 7.0
+  - nightly
 
 env:
-  - DB=agnostic                                   #only database agnostic tests
-  - DB=mysql DB_USER=root                         #only database tests against mysql
-  - DB=pgsql DB_USER=postgres DB_NAME=postgres    #only database tests against postgresql
+  - DB=agnostic #only database agnostic tests
+  - DB=mysql
   - DB=sqlite
 
-before_script:
-  # Composer
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install --prefer-dist
+before_install:
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer install --prefer-dist --no-interaction
 
-  - if [ "$DB" != 'agnostic' ]; then ./tests/bin/setup.$DB.sh; fi   # setup only for integration tests
+before_script:
+  - if [[ $DB != 'agnostic' && $DB != 'sqlite' ]]; then ./tests/bin/setup.$DB.sh; fi
 
 script:
-  - ./tests/bin/phpunit.$DB.sh;
+  - ./vendor/bin/phpunit -v -c tests/$DB.phpunit.xml;
 
 
 matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
+  include:
+    - php: 5.4
+      env: DB=mysql MARIADB=5.5
+      addons:
+        mariadb: 5.5
+    - php: 5.5
+      env: DB=mysql MARIADB=5.5
+      addons:
+        mariadb: 5.5
+    - php: 5.6
+      env: DB=mysql MARIADB=5.5
+      addons:
+        mariadb: 5.5
+    - php: 7.0
+      env: DB=mysql MARIADB=5.5
+      addons:
+        mariadb: 5.5
+
+    - php: 5.4
+      env: DB=mysql MARIADB=10.0
+      addons:
+        mariadb: 10.0
+    - php: 5.5
+      env: DB=mysql MARIADB=10.0
+      addons:
+        mariadb: 10.0
+    - php: 5.6
+      env: DB=mysql MARIADB=10.0
+      addons:
+        mariadb: 10.0
+    - php: 7.0
+      env: DB=mysql MARIADB=10.0
+      addons:
+        mariadb: 10.0
+
+    - php: 5.4
+      env: DB=mysql MARIADB=10.1
+      addons:
+        mariadb: 10.1
+    - php: 5.5
+      env: DB=mysql MARIADB=10.1
+      addons:
+        mariadb: 10.1
+    - php: 5.6
+      env: DB=mysql MARIADB=10.1
+      addons:
+        mariadb: 10.1
+    - php: 7.0
+      env: DB=mysql MARIADB=10.1
+      addons:
+        mariadb: 10.1
+
+    - php: 5.4
+      env: DB=pgsql POSTGRES=9.1
+      addons:
+       postgresql: 9.1
+    - php: 5.5
+      env: DB=pgsql POSTGRES=9.1
+      addons:
+        postgresql: 9.1
+    - php: 5.6
+      env: DB=pgsql POSTGRES=9.1
+      addons:
+        postgresql: 9.1
+    - php: 7.0
+      env: DB=pgsql POSTGRES=9.1
+      addons:
+        postgresql: 9.1
+
+    - php: 5.4
+      env: DB=pgsql POSTGRES=9.2
+      addons:
+       postgresql: 9.2
+    - php: 5.5
+      env: DB=pgsql POSTGRES=9.2
+      addons:
+        postgresql: 9.2
+    - php: 5.6
+      env: DB=pgsql POSTGRES=9.2
+      addons:
+        postgresql: 9.2
+    - php: 7.0
+      env: DB=pgsql POSTGRES=9.2
+      addons:
+        postgresql: 9.2
+
+    - php: 5.4
+      env: DB=pgsql POSTGRES=9.3
+      addons:
+       postgresql: 9.3
+    - php: 5.5
+      env: DB=pgsql POSTGRES=9.3
+      addons:
+        postgresql: 9.3
     - php: 5.6
-  exclude:
-    - php: hhvm
-      env: DB=pgsql DB_USER=postgres DB_NAME=postgres  # driver currently unsupported by HHVM
-    - php: hhvm
-      env: DB=sqlite # some issues at the moment
-
-#after_script:
-#  - php vendor/bin/coveralls -v
+      env: DB=pgsql POSTGRES=9.3
+      addons:
+        postgresql: 9.3
+    - php: 7.0
+      env: DB=pgsql POSTGRES=9.3
+      addons:
+        postgresql: 9.3
+
+    - php: 5.4
+      env: DB=pgsql POSTGRES=9.4
+      addons:
+       postgresql: 9.4
+    - php: 5.5
+      env: DB=pgsql POSTGRES=9.4
+      addons:
+        postgresql: 9.4
+    - php: 5.6
+      env: DB=pgsql POSTGRES=9.4
+      addons:
+        postgresql: 9.4
+    - php: 7.0
+      env: DB=pgsql POSTGRES=9.4
+      addons:
+        postgresql: 9.4
+
+  allow_failures:
+    - php: nightly
+
+  fast_finish: true
+
+# cache vendors
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
+
+notifications:
+  webhooks:
+    - http://propel.jarves.io/build.php
+    - https://webhooks.gitter.im/e/206efe76e183f9ade489
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4.
 
-[![Build Status](https://circleci.com/gh/propelorm/Propel2/tree/master.png?style=shield)](https://circleci.com/gh/propelorm/Propel2/tree/master)
+[![Build Status](https://travis-ci.org/propelorm/Propel2.svg?branch=master)](https://travis-ci.org/propelorm/Propel2)
 [![Code Climate](https://codeclimate.com/github/propelorm/Propel2/badges/gpa.svg)](https://codeclimate.com/github/propelorm/Propel2)
 <a href="https://codeclimate.com/github/propelorm/Propel2"><img src="https://codeclimate.com/github/propelorm/Propel2/badges/coverage.svg" /></a>
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/propelorm/Propel)

diff --git a/circle.yml b/circle.yml
@@ -10,7 +10,6 @@ dependencies:
     - echo "memory_limit=520M" > ~/.phpenv/versions/$(phpenv global)/etc/conf.d/memlimit.ini
     - if [ "$CIRCLE_NODE_INDEX" = "1" ]; then ./tests/bin/setup.mysql.sh; fi
     - if [ "$CIRCLE_NODE_INDEX" = "2" ]; then ./tests/bin/setup.pgsql.sh; fi
-    - if [ "$CIRCLE_NODE_INDEX" = "3" ]; then ./tests/bin/setup.sqlite.sh; fi
 
 notify:
   webhooks:
@@ -20,5 +19,5 @@ notify:
 
 test:
   override:
-    - ./tests/bin/phpunit.circleci.sh:
+    - ./tests/bin/circleci.sh:
         parallel: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,7 +7,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
     >
 
@@ -17,6 +16,19 @@
     </testsuite>
   </testsuites>
 
+  <groups>
+    <exclude>
+      <group>pgsql</group>
+      <group>mysql</group>
+    </exclude>
+  </groups>
+
+  <php>
+    <env name="DB" value="mysql"/> <!-- mysql, sqlite, pgsql -->
+    <env name="DB_USER" value=""/>
+    <env name="DB_PW" value=""/>
+  </php>
+
   <logging>
       <!--<log type="coverage-php" target="tests/clover.cov"/>-->
       <!--<log type="coverage-html" target="tests/coverage-report" charset="UTF-8"
@@ -26,26 +38,6 @@
   <filter>
     <whitelist>
       <directory>src/Propel/</directory>
-      <exclude>
-        <directory>src/Propel/Generator/Builder/SQL/Mssql</directory>
-        <directory>src/Propel/Generator/Builder/SQL/Oracle</directory>
-        <directory>src/Propel/Generator/Builder/SQL/Sqlsrv</directory>
-
-        <file>src/Propel/Generator/Platform/MssqlPlatform.php</file>
-        <file>src/Propel/Generator/Platform/OraclePlatform.php</file>
-        <file>src/Propel/Generator/Platform/SqlsrvPlatform.php</file>
-
-        <file>src/Propel/Generator/Reverse/MssqlSchemaParser.php</file>
-        <file>src/Propel/Generator/Reverse/OracleSchemaParser.php</file>
-        <file>src/Propel/Generator/Reverse/SqlsrvSchemaParser.php</file>
-
-        <directory>src/Propel/Runtime/Adapter/MSSQL</directory>
-        <file>src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php</file>
-        <file>src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php</file>
-        <file>src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php</file>
-
-        <file>src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php</file>
-      </exclude>
     </whitelist>
   </filter>
 </phpunit>
diff --git a/tests/Propel/Tests/BookstoreLoggingTest.php b/tests/Propel/Tests/BookstoreLoggingTest.php
@@ -131,6 +131,11 @@ public function testQueryFilter()
         $this->assertEquals($author->getId(), $foundAuthor->getId());
     }
 
+    /**
+     *
+     * @group mysql
+     * @group pgsql
+     */
     public function testQueryJoins()
     {
         if ($this->runningOnSQLite()) {

diff --git a/tests/Propel/Tests/Issues/Issue646Test.php b/tests/Propel/Tests/Issues/Issue646Test.php
@@ -26,20 +26,20 @@ protected function setUp()
         parent::setUp();
         if (!class_exists('\PkDate')) {
             $schema = '
-            <database name="test" defaultIdMethod="native"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-           <table name="pk_date">
-           <column name="created_at" type="DATE" primaryKey="true" />
-           <column name="name" type="VARCHAR"/>
-            </table>
-            <table name="pk_time">
-           <column name="created_at" type="TIME" primaryKey="true" />
-           <column name="name" type="VARCHAR"/>
-            </table>
-            <table name="pk_timestamp">
-           <column name="created_at" type="TIMESTAMP" primaryKey="true" />
-           <column name="name" type="VARCHAR"/>
-            </table>';
+            <database name="test" defaultIdMethod="native" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <table name="pk_date">
+                    <column name="created_at" type="DATE" primaryKey="true" />
+                    <column name="name" type="VARCHAR"/>
+                </table>
+                <table name="pk_time">
+                    <column name="created_at" type="TIME" primaryKey="true" />
+                    <column name="name" type="VARCHAR"/>
+                </table>
+                <table name="pk_timestamp">
+                    <column name="created_at" type="TIMESTAMP" primaryKey="true" />
+                    <column name="name" type="VARCHAR"/>
+                </table>
+            </database>';
             QuickBuilder::buildSchema($schema);
         }
 

diff --git a/tests/Propel/Tests/TestCaseFixtures.php b/tests/Propel/Tests/TestCaseFixtures.php
@@ -222,7 +222,7 @@ protected function getFixturesConnectionDsn()
         if (!$db || 'agnostic' === $db) {
             $db = 'mysql';
         }
-
+        
         $dsn = $db . ':host=' . (getenv('DB_HOSTNAME') ?: '127.0.0.1' ) . ';dbname=';
         $dsn .= getenv('DB_NAME') ?: 'test';
 

diff --git a/tests/agnostic.phpunit.xml b/tests/agnostic.phpunit.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" bootstrap="bootstrap.php">
+
+  <testsuites>
+    <testsuite name="Propel2 Test Suite">
+      <directory>Propel/Tests/</directory>
+    </testsuite>
+  </testsuites>
+
+  <groups>
+    <exclude>
+      <group>database</group>
+      <group>pgsql</group>
+      <group>mysql</group>
+    </exclude>
+  </groups>
+
+  <filter>
+    <whitelist>
+      <directory>../src/Propel/</directory>
+      <exclude>
+        <directory>../src/Propel/Generator/Builder/SQL/Mssql</directory>
+        <directory>../src/Propel/Generator/Builder/SQL/Oracle</directory>
+        <directory>../src/Propel/Generator/Builder/SQL/Sqlsrv</directory>
+
+        <file>../src/Propel/Generator/Platform/MssqlPlatform.php</file>
+        <file>../src/Propel/Generator/Platform/OraclePlatform.php</file>
+        <file>../src/Propel/Generator/Platform/SqlsrvPlatform.php</file>
+
+        <file>../src/Propel/Generator/Reverse/MssqlSchemaParser.php</file>
+        <file>../src/Propel/Generator/Reverse/OracleSchemaParser.php</file>
+        <file>../src/Propel/Generator/Reverse/SqlsrvSchemaParser.php</file>
+
+        <directory>../src/Propel/Runtime/Adapter/MSSQL</directory>
+        <file>../src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php</file>
+        <file>../src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php</file>
+        <file>../src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php</file>
+
+        <file>../src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php</file>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/tests/bin/base.sh b/tests/bin/base.sh