doctrine / orm

lib/Doctrine/ORM/Mapping/ReservedWordQuoteStrategy.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
  */

 class ReservedWordQuoteStrategy implements QuoteStrategy

 {

-   /**

+    /**

      * @param AbstractPlatform $platform

      * @param string $name

      * @param bool $force

Spacing +7 added lines, -7 removed lines

@@ -72,10 +72,10 @@ 
         $tableName = $class->table['name'];

 

         if ( ! empty($class->table['schema'])) {

-            $tableName = $class->table['schema'] . '.' . $class->table['name'];

+            $tableName = $class->table['schema'].'.'.$class->table['name'];

 

             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {

-                $tableName = $class->table['schema'] . '__' . $class->table['name'];

+                $tableName = $class->table['schema'].'__'.$class->table['name'];

             }

         }

 

@@ -130,7 +130,7 @@ 
         $schema = '';

 

         if (isset($association['joinTable']['schema'])) {

-            $schema = $association['joinTable']['schema'] . '.';

+            $schema = $association['joinTable']['schema'].'.';

         }

 

         $tableName = $association['joinTable']['name'];

@@ -141,7 +141,7 @@ 
             isset($association['joinTable']['quoted'])

         );

 

-        return $schema . $tableName;

+        return $schema.$tableName;

     }

 

     /**

@@ -162,7 +162,7 @@ 
             $self                   = $this;

             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];

             $assocQuotedColumnNames = array_map(

-                function ($joinColumn) use ($platform, $self)

+                function($joinColumn) use ($platform, $self)

                 {

                     return $self->getQuotedName(

                         $platform,

@@ -189,10 +189,10 @@ 
         //     If the alias is to long, characters are cut off from the beginning.

         // 3 ) Strip non alphanumeric characters

         // 4 ) Prefix with "_" if the result its numeric

-        $columnName = $columnName . '_' . $counter;

+        $columnName = $columnName.'_'.$counter;

         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());

         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);

-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;

+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;

 

         return $platform->getSQLResultCasing($columnName);

     }

tests/Doctrine/Tests/ORM/Mapping/ReservedWordQuoteStrategyTest.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
      */
     protected function assertQuoted($expected, $actual, $message = '')
     {
-        $this->assertEquals('"' . $expected . '"', $actual, $message);
+        $this->assertEquals('"'.$expected.'"', $actual, $message);
     }
 
     /**
@@ -184,7 +184,7 @@ 
             'columnName'    => $notQuoted,
         ));
 
-        $this->assertEquals(array('"' . $quoted . '"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
+        $this->assertEquals(array('"'.$quoted.'"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
         $this->assertEquals(array($notQuoted), $this->strategy->getIdentifierColumnNames($cm2, $this->platform));
     }
 
@@ -213,7 +213,7 @@ 
             )),
         ));
 
-        $this->assertEquals(array('"' . $quoted . '"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
+        $this->assertEquals(array('"'.$quoted.'"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
 
         $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
         $cm2->mapOneToOne(array(