Fixed CS (PHP-CS-Fixer)

FXdSP · May 22, 2012 · 5f1a736 · 5f1a736
1 parent 44a79a0
commit 5f1a736
Show file tree

Hide file tree

Showing 82 changed files with 250 additions and 319 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ composer.phar
 composer.lock
 pom.xml
 check_cs
+php-cs-fixer.phar
 
 tests/Fixtures/namespaced/build/
 tests/Fixtures/nestedset/build/

diff --git a/src/Propel/Generator/Behavior/Archivable/templates/objectPopulateFromArchive.php b/src/Propel/Generator/Behavior/Archivable/templates/objectPopulateFromArchive.php
@@ -11,8 +11,7 @@
  *
  * @return     <?php echo $objectClassName ?> The current object (for fluent API support)
  */
-public function populateFromArchive($archive<?php if ($usesAutoIncrement): ?>, $populateAutoIncrementPrimaryKeys = false<?php endif; ?>)
-{
+public function populateFromArchive($archive<?php if ($usesAutoIncrement): ?>, $populateAutoIncrementPrimaryKeys = false<?php endif; ?>) {
 <?php if ($usesAutoIncrement): ?>
     if ($populateAutoIncrementPrimaryKeys) {
 <?php foreach ($columns as $col): ?>

diff --git a/src/Propel/Generator/Behavior/Validate/ValidateBehavior.php b/src/Propel/Generator/Behavior/Validate/ValidateBehavior.php
@@ -135,11 +135,11 @@ public function mergeParameters(array $params = null)
             $parameters = $this->getParameters();
             $out = array();
             $i = 1;
-            foreach($parameters as $key => $parameter) {
+            foreach ($parameters as $key => $parameter) {
                 $out["rule$i"] = $parameter;
                 $i++;
             }
-            foreach($params as $key => $param) {
+            foreach ($params as $key => $param) {
                 $out["rule$i"] = $param;
                 $i++;
             }

diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -1261,7 +1261,7 @@ protected function addLazyLoaderBody(&$script, Column $column)
             // PDO_OCI returns a stream for CLOB objects, while other PDO adapters return a string...
             $script .= "
             \$this->$clo = stream_get_contents(\$row[0]);";
-        }    elseif ($column->isLobType() && !$platform->hasStreamBlobImpl()) {
+        } elseif ($column->isLobType() && !$platform->hasStreamBlobImpl()) {
             $script .= "
             if (\$row[0] !== null) {
                 \$this->$clo = fopen('php://memory', 'r+');
@@ -1805,7 +1805,8 @@ protected function addHasOnlyDefaultValues(&$script)
      * @param      string &$script The script will be modified in this method.
      * @see        addHasOnlyDefaultValues
      **/
-    protected function addHasOnlyDefaultValuesComment(&$script) {
+    protected function addHasOnlyDefaultValuesComment(&$script)
+    {
         $script .= "
     /**
      * Indicates whether the columns in this object are only set to default values.
@@ -1822,7 +1823,8 @@ protected function addHasOnlyDefaultValuesComment(&$script) {
      * @param      string &$script The script will be modified in this method.
      * @see        addHasOnlyDefaultValues
      **/
-    protected function addHasOnlyDefaultValuesOpen(&$script) {
+    protected function addHasOnlyDefaultValuesOpen(&$script)
+    {
         $script .= "
     public function hasOnlyDefaultValues()
     {";
@@ -1943,7 +1945,7 @@ protected function addHydrateBody(&$script)
                     // PDO_OCI returns a stream for CLOB objects, while other PDO adapters return a string...
                     $script .= "
             \$this->$clo = stream_get_contents(\$row[\$startcol + $n]);";
-                }    elseif ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
+                } elseif ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
                     $script .= "
             if (\$row[\$startcol + $n] !== null) {
                 \$this->$clo = fopen('php://memory', 'r+');
@@ -2372,7 +2374,7 @@ protected function addGetByPositionBody(&$script)
     {
         $table = $this->getTable();
         $script .= "
-        switch(\$pos) {";
+        switch (\$pos) {";
         $i = 0;
         foreach ($table->getColumns() as $col) {
             $cfc = $col->getPhpName();
@@ -2439,7 +2441,7 @@ protected function addSetByPosition(&$script)
      */
     public function setByPosition(\$pos, \$value)
     {
-        switch(\$pos) {";
+        switch (\$pos) {";
         $i = 0;
         foreach ($table->getColumns() as $col) {
             $cfc = $col->getPhpName();
@@ -3392,8 +3394,8 @@ public function initRelation(\$relationName)
      * Adds the method that clears the referrer fkey collection.
      * @param      string &$script The script will be modified in this method.
      */
-    protected function addRefFKClear(&$script, ForeignKey $refFK) {
-
+    protected function addRefFKClear(&$script, ForeignKey $refFK)
+    {
         $relCol = $this->getRefFKPhpNameAffix($refFK, true);
         $collName = $this->getRefFKCollVarName($refFK);
 
@@ -3418,8 +3420,8 @@ public function clear$relCol()
      * Adds the method that initializes the referrer fkey collection.
      * @param      string &$script The script will be modified in this method.
      */
-    protected function addRefFKInit(&$script, ForeignKey $refFK) {
-
+    protected function addRefFKInit(&$script, ForeignKey $refFK)
+    {
         $relCol = $this->getRefFKPhpNameAffix($refFK, true);
         $collName = $this->getRefFKCollVarName($refFK);
 
@@ -4944,7 +4946,7 @@ public function clear()
                 $script .= "
         \$this->".$clo."_isLoaded = false;";
             }
-            if($col->getType() == PropelTypes::OBJECT || $col->getType() == PropelTypes::PHP_ARRAY) {
+            if ($col->getType() == PropelTypes::OBJECT || $col->getType() == PropelTypes::PHP_ARRAY) {
                 $cloUnserialized = $clo.'_unserialized';
 
                 $script .="

diff --git a/src/Propel/Generator/Builder/Om/PeerBuilder.php b/src/Propel/Generator/Builder/Om/PeerBuilder.php
@@ -1234,7 +1234,7 @@ static public function getOMClass(\$row, \$colnum, \$withPrefix = true)
             \$omClass = null;
             \$classKey = \$row[\$colnum + " . ($col->getPosition() - 1) . "];
 
-            switch(\$classKey) {
+            switch (\$classKey) {
 ";
             foreach ($col->getChildren() as $child) {
                 $script .= "
@@ -1383,7 +1383,7 @@ static public function doInsert(\$values, ConnectionInterface \$con = null)
             \$con->beginTransaction();
             \$pk = ".$this->basePeerClassName."::doInsert(\$criteria, \$con);
             \$con->commit();
-        } catch(PropelException \$e) {
+        } catch (PropelException \$e) {
             \$con->rollBack();
             throw \$e;
         }

diff --git a/src/Propel/Generator/Builder/Util/SchemaReader.php b/src/Propel/Generator/Builder/Util/SchemaReader.php
@@ -209,7 +209,7 @@ public function startElement($parser, $name, $attributes)
                     $this->_throwInvalidTagException($parser, $name);
             }
 
-        } elseif  ('table' === $parentTag) {
+        } elseif ('table' === $parentTag) {
             switch ($name) {
                 case 'column':
                     $this->currColumn = $this->currTable->addColumn($attributes);
@@ -243,7 +243,7 @@ public function startElement($parser, $name, $attributes)
                     $this->_throwInvalidTagException($parser, $name);
             }
 
-        } elseif  ('column' === $parentTag) {
+        } elseif ('column' === $parentTag) {
 
             switch ($name) {
                 case 'inheritance':
@@ -290,7 +290,7 @@ public function startElement($parser, $name, $attributes)
 
         } elseif ('unique' === $parentTag) {
 
-            switch($name) {
+            switch ($name) {
                 case 'unique-column':
                     $this->currUnique->addColumn($attributes);
                     break;

diff --git a/src/Propel/Generator/Config/ArrayToPhpConverter.php b/src/Propel/Generator/Config/ArrayToPhpConverter.php
@@ -96,7 +96,7 @@ public static function convert($c)
             unset($c['log']);
         }
 
-        return $conf;
+        return preg_replace('/[ \t]*$/m', '', $conf);
     }
 
     protected static function getLoggerCode($conf)

diff --git a/src/Propel/Runtime/Connection/ConnectionWrapper.php b/src/Propel/Runtime/Connection/ConnectionWrapper.php
@@ -339,7 +339,7 @@ public function setAttribute($attribute, $value)
             }
             $attribute = constant($attribute);
         }
-        switch($attribute) {
+        switch ($attribute) {
             case self::PROPEL_ATTR_CACHE_PREPARES:
                 $this->isCachePreparedStatements = $value;
                 break;

diff --git a/src/Propel/Runtime/Om/BaseObject.php b/src/Propel/Runtime/Om/BaseObject.php
@@ -64,8 +64,8 @@ abstract class BaseObject
     /**
      * Empty constructor (this allows people with their own BaseObject implementation to use its constructor)
      */
-    public function __construct() {
-
+    public function __construct()
+    {
     }
 
     /**

diff --git a/src/Propel/Runtime/Query/Criteria.php b/src/Propel/Runtime/Query/Criteria.php
@@ -1543,7 +1543,7 @@ public function mergeWith(Criteria $criteria, $operator = null)
 
         // merge select modifiers
         $selectModifiers = $criteria->getSelectModifiers();
-        if ($selectModifiers && ! $this->selectModifiers){
+        if ($selectModifiers && ! $this->selectModifiers) {
             $this->selectModifiers = $selectModifiers;
         }
 

diff --git a/src/Propel/Runtime/Query/ModelCriteria.php b/src/Propel/Runtime/Query/ModelCriteria.php
@@ -1123,7 +1123,7 @@ static public function getRelationName($relation)
     {
         // get the relationName
         list($fullName, $relationAlias) = self::getClassAndAlias($relation);
-        if ($relationAlias)  {
+        if ($relationAlias) {
             $relationName = $relationAlias;
         } elseif (false === strpos($fullName, '.')) {
             $relationName = $fullName;

diff --git a/src/Propel/Runtime/Util/BasePeer.php b/src/Propel/Runtime/Util/BasePeer.php
@@ -217,7 +217,8 @@ static public function doDeleteAll($tableName, ConnectionInterface $con, $databa
      *                is auto-generated.  Otherwise will return <code>null</code>.
      * @throws     \Propel\Runtime\Exception\RuntimeException
      */
-    static public function doInsert(Criteria $criteria, ConnectionInterface $con) {
+    static public function doInsert(Criteria $criteria, ConnectionInterface $con)
+    {
         // The primary key
         $id = null;
         $db = Propel::getServiceContainer()->getAdapter($criteria->getDbName());
@@ -330,8 +331,8 @@ static public function doInsert(Criteria $criteria, ConnectionInterface $con) {
      *                 is returned (supported) by the Propel db driver.
      * @throws     \Propel\Runtime\Exception\RuntimeException
      */
-    static public function doUpdate(Criteria $selectCriteria, Criteria $updateValues, ConnectionInterface $con) {
-
+    static public function doUpdate(Criteria $selectCriteria, Criteria $updateValues, ConnectionInterface $con)
+    {
         $db = Propel::getServiceContainer()->getAdapter($selectCriteria->getDbName());
         $dbMap = Propel::getServiceContainer()->getDatabaseMap($selectCriteria->getDbName());
 
@@ -738,7 +739,7 @@ static public function createSelectSql(Criteria $criteria, &$params)
                 if ($spacePos !== false) {
                     $direction = substr($columnName, $spacePos);
                     $columnName = substr($columnName, 0, $spacePos);
-                }    else {
+                } else {
                     $direction = '';
                 }
 

diff --git a/tests/Fixtures/bookstore-packaged/book.schema.xml b/tests/Fixtures/bookstore-packaged/book.schema.xml
@@ -38,7 +38,7 @@
         local="author_id"
         foreign="id"/>
     </foreign-key>
-    
+
   </table>
 
 </database>
diff --git a/tests/Fixtures/bookstore-packaged/external/author.schema.xml b/tests/Fixtures/bookstore-packaged/external/author.schema.xml
@@ -26,7 +26,7 @@
       name="age"
       type="INTEGER"
       description="The authors age"/>
-    
+
   </table>
 
 </database>
diff --git a/tests/Fixtures/bookstore/behavior-validate-schema.xml b/tests/Fixtures/bookstore/behavior-validate-schema.xml
@@ -47,7 +47,7 @@
             <parameter name="rule6" value="{column: birthday, validator: Date}" />
         </behavior>
     </table>
-    
+
     <table name="validate_reader" description="Reader Table">
         <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" description="Author Id" />
         <column name="first_name" required="true" type="VARCHAR" size="128" description="First Name" />
@@ -63,7 +63,7 @@
             <parameter name="rule6" value="{column: birthday, validator: Date}" />
         </behavior>
     </table>
-    
+
     <table name="validate_reader_book" isCrossRef="true">
          <column name="reader_id" type="INTEGER" primaryKey="true"/>
          <column name="book_id" type="INTEGER" primaryKey="true"/>
@@ -80,5 +80,5 @@
             <parameter name="rule4" value="{column: book_id, validator: Type, options: {type: integer}}" />
         </behavior>
      </table>
-    
-</database>
+
+</database>
diff --git a/tests/Fixtures/bookstore/behavior-validate-triggers-schema.xml b/tests/Fixtures/bookstore/behavior-validate-triggers-schema.xml
@@ -16,14 +16,14 @@
              <parameter name="i18n_columns" value="title" />
         </behavior>
     </table>
-    
+
     <table name="validate_trigger_fiction">
         <behavior name="concrete_inheritance">
             <parameter name="extends" value="validate_trigger_book" />
         </behavior>
         <column name="foo" type="VARCHAR" size="100"/>
     </table>
-    
+
     <table name="validate_trigger_comic">
         <behavior name="concrete_inheritance">
             <parameter name="extends" value="validate_trigger_book" />
@@ -34,5 +34,5 @@
             <parameter name="rule2" value="{column: bar, validator: Type, options: {type: string }}" />
         </behavior>
     </table>
-    
-</database>
+
+</database>
diff --git a/...s/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php b/...s/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
@@ -42,7 +42,7 @@ class ConcreteInheritanceBehaviorTest extends BookstoreTestBase
     public function setUp()
     {
         parent::setUp();
-        
+
         if (!class_exists('ConcreteContentSetPkQuery')) {
             $schema = <<<EOF
 <database name="concrete_content_set_pk">
@@ -67,7 +67,7 @@ public function setUp()
             QuickBuilder::buildSchema($schema);
         }
     }
-    
+
     public function testParentBehavior()
     {
         $behaviors = ConcreteContentPeer::getTableMap()->getBehaviors();
@@ -274,7 +274,7 @@ public function testGetParentOrCreateNewWithPK()
         $this->assertEquals(5,$content->getId(), 'getParentOrCreate() returns a instance of the parent class with pk set');
         $this->assertEquals('ConcreteArticleSetPk', $content->getDescendantClass(), 'getParentOrCreate() correctly sets the descendant_class of the parent object');
     }
-    
+
     public function testSetPKOnNewObject()
     {
         \ConcreteContentSetPkQuery::create()->deleteAll();
@@ -287,7 +287,7 @@ public function testSetPKOnNewObject()
         $articledb = \ConcreteArticleSetPkQuery::create()->findOneById(2);
         $this->assertEquals(2, $articledb->getId(), 'getParentOrCreate() keeps manually set pk after save and reload from db');
     }
-    
+
     public function testSetPKOnNewObjectWithPkAlreadyInParentTable()
     {
         \ConcreteContentSetPkQuery::create()->deleteAll();
@@ -304,7 +304,7 @@ public function testSetPKOnNewObjectWithPkAlreadyInParentTable()
             $this->assertTrue(true, 'getParentOrCreate() returns a new parent object on new child objects with pk set');
         }
     }
-    
+
     public function testSetPkAllowPkInsertIsFalse()
     {
         ConcreteContentQuery::create()->deleteAll();
@@ -318,5 +318,5 @@ public function testSetPkAllowPkInsertIsFalse()
             $this->assertTrue(true, 'SetPk fails when allowPkInsert is false');
         }
     }
-    
+
 }
diff --git a/...el/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php b/...el/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehaviorTest.php
@@ -15,15 +15,8 @@
 
 use Propel\Tests\Bookstore\Behavior\ConcreteArticle;
 use Propel\Tests\Bookstore\Behavior\ConcreteArticleQuery;
-use Propel\Tests\Bookstore\Behavior\ConcreteArticlePeer;
-use Propel\Tests\Bookstore\Behavior\ConcreteAuthorPeer;
-use Propel\Tests\Bookstore\Behavior\ConcreteCategory;
-use Propel\Tests\Bookstore\Behavior\ConcreteCategoryQuery;
 use Propel\Tests\Bookstore\Behavior\ConcreteContent;
 use Propel\Tests\Bookstore\Behavior\ConcreteContentQuery;
-use Propel\Tests\Bookstore\Behavior\ConcreteContentPeer;
-use Propel\Tests\Bookstore\Behavior\ConcreteQuizz;
-use Propel\Tests\Bookstore\Behavior\ConcreteQuizzPeer;
 use Propel\Tests\Bookstore\Behavior\ConcreteQuizzQuery;
 
 /**

diff --git a/.../Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php b/.../Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
@@ -12,13 +12,11 @@
 
 use Propel\Tests\Helpers\Bookstore\Behavior\BookstoreNestedSetTestBase;
 use Propel\Tests\Helpers\Bookstore\Behavior\PublicTable9;
-use Propel\Tests\Helpers\Bookstore\Behavior\PublicTable10;
 
 use Propel\Tests\Bookstore\Behavior\Table9;
 use Propel\Tests\Bookstore\Behavior\Table9Peer;
 use Propel\Tests\Bookstore\Behavior\Table9Query;
 use Propel\Tests\Bookstore\Behavior\Table10;
-use Propel\Tests\Bookstore\Behavior\Table10Peer;
 
 use Propel\Runtime\Propel;
 use Propel\Runtime\Collection\ObjectCollection;
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,8 +64,8 @@ abstract class BaseObject @@
         /**
          * Empty constructor (this allows people with their own BaseObject implementation to use its constructor)
          */
-        public function __construct() {
+        public function __construct()
+        {
         }
         /**
@@ Expand Down @@