Merge pull request #1042 from propelorm/revert-1000-tr

Revert "Migrate from circle to travis"

Author: marcj

.travis.yml

@@ -4,164 +4,35 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - 7.0
-  - nightly
+  - hhvm
 
 env:
-  - DB=agnostic #only database agnostic tests
-  - DB=mysql
+  - 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=sqlite
 
-before_install:
-  - travis_retry composer self-update
-
-install:
-  - travis_retry composer install --prefer-dist --no-interaction
-
 before_script:
-  - if [[ $DB != 'agnostic' && $DB != 'sqlite' ]]; then ./tests/bin/setup.$DB.sh; fi
+  # Composer
+  - wget http://getcomposer.org/composer.phar
+  - php composer.phar install --prefer-dist
+
+  - if [ "$DB" != 'agnostic' ]; then ./tests/bin/setup.$DB.sh; fi   # setup only for integration tests
 
 script:
-  - ./vendor/bin/phpunit -v -c tests/$DB.phpunit.xml;
+  - ./tests/bin/phpunit.$DB.sh;
 
 
 matrix:
-  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
-      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
+  allow_failures:
+    - php: hhvm
+    - 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

README.md

@@ -2,7 +2,7 @@
 
 Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4.
 
-[![Build Status](https://travis-ci.org/propelorm/Propel2.svg?branch=master)](https://travis-ci.org/propelorm/Propel2)
+[![Build Status](https://circleci.com/gh/propelorm/Propel2/tree/master.png?style=shield)](https://circleci.com/gh/propelorm/Propel2/tree/master)
 [![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)

circle.yml

@@ -10,6 +10,7 @@ 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:

phpunit.xml.dist

@@ -7,6 +7,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
+         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
     >
 
@@ -16,19 +17,6 @@
     </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"
@@ -38,6 +26,26 @@
   <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>

src/Propel/Generator/Util/QuickBuilder.php

@@ -487,12 +487,6 @@ public function fixNamespaceDeclarations($source)
     protected function forceNamespace($code)
     {
         if (0 === preg_match('/\nnamespace/', $code)) {
-
-            $use = array_filter(explode(PHP_EOL, $code), function($string) {
-                return substr($string, 0, 5) === 'use \\';
-            });
-
-            $code = str_replace($use, '', $code);
             return "\nnamespace\n{\n" . $code . "\n}\n";
         }
 

tests/Propel/Tests/BookstoreLoggingTest.php

@@ -131,11 +131,6 @@ public function testQueryFilter()
         $this->assertEquals($author->getId(), $foundAuthor->getId());
     }
 
-    /**
-     *
-     * @group mysql
-     * @group pgsql
-     */
     public function testQueryJoins()
     {
         if ($this->runningOnSQLite()) {

tests/Propel/Tests/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifierTest.php

@@ -21,9 +21,10 @@
 class VersionableBehaviorObjectBuilderModifierTest extends TestCase
 {
 
-    public static function setUpBeforeClass()
+    public function setUp()
     {
-        $schema = <<<EOF
+        if (!class_exists('VersionableBehaviorTest1')) {
+            $schema = <<<EOF
 <database name="versionable_behavior_test_1">
     <table name="versionable_behavior_test_1">
         <column name="id" primaryKey="true" type="INTEGER" autoIncrement="true" />
@@ -64,9 +65,10 @@ public static function setUpBeforeClass()
     </table>
 </database>
 EOF;
-        QuickBuilder::buildSchema($schema);
-
-        $schema2 = <<<EOF
+            QuickBuilder::buildSchema($schema);
+        }
+        if (!class_exists('VersionableBehaviorTest6')) {
+            $schema2 = <<<EOF
 <database name="versionable_behavior_test_2" defaultPhpNamingMethod="nochange">
     <table name="VersionableBehaviorTest6">
         <column name="Id" primaryKey="true" type="INTEGER" autoIncrement="true" />
@@ -96,9 +98,11 @@ public static function setUpBeforeClass()
     </table>
 </database>
 EOF;
-        QuickBuilder::buildSchema($schema2);
+            QuickBuilder::buildSchema($schema2);
+        }
 
-        $schema3 = <<<EOF
+        if (!class_exists('VersionableBehaviorTest8')) {
+            $schema2 = <<<EOF
 <database name="versionable_behavior_test_3" defaultPhpNamingMethod="nochange">
     <table name="VersionableBehaviorTest8">
         <column name="Id" primaryKey="true" type="INTEGER" autoIncrement="true" />
@@ -113,10 +117,12 @@ public static function setUpBeforeClass()
     </table>
 </database>
 EOF;
-        QuickBuilder::buildSchema($schema3);
+            QuickBuilder::buildSchema($schema2);
+        }
 
 
-        $schema4 = <<<EOF
+        if (!class_exists('VersionableBehaviorTest10')) {
+            $schema4 = <<<EOF
 <database name="versionable_behavior_test_4">
     <table name="VersionableBehaviorTest10">
         <column name="id" primaryKey="true" type="INTEGER" autoIncrement="true" />
@@ -147,7 +153,8 @@ public static function setUpBeforeClass()
     </table>
 </database>
 EOF;
-        QuickBuilder::buildSchema($schema4);
+            QuickBuilder::buildSchema($schema4);
+        }
     }
 
     public function testGetVersionExists()

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>';
+            <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>';
             QuickBuilder::buildSchema($schema);
         }
 

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';