doctrine / orm

lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     public function __construct()
     {
-        @trigger_error(self::class . ' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
+        @trigger_error(self::class.' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
     }
 
     /**

lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function __construct($dir = null)
     {
-        @trigger_error(static::class . ' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
+        @trigger_error(static::class.' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
 
         $this->_outputDir = $dir;
     }
@@ -146,7 +146,7 @@ 
                 if ( ! is_dir($dir)) {
                     mkdir($dir, 0775, true);
                 }
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
                     throw ExportException::attemptOverwriteExistingFile($path);
                 }
                 file_put_contents($path, $output);
@@ -164,7 +164,7 @@ 
      */
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
     }
 
     /**

lib/Doctrine/ORM/EntityManager.php

Spacing +11 added lines, -11 removed lines

@@ -227,8 +227,8 @@ 
      */
     public function transactional($func)
     {
-        if (!is_callable($func)) {
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
+        if ( ! is_callable($func)) {
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
         }
 
         $this->conn->beginTransaction();
@@ -358,7 +358,7 @@ 
     {
         if ($entity !== null) {
             @trigger_error(
-                'Calling ' . __METHOD__ . '() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine ORM 3.0.',
+                'Calling '.__METHOD__.'() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine ORM 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -558,7 +558,7 @@ 
 
         if ($entityName !== null) {
             @trigger_error(
-                'Calling ' . __METHOD__ . '() with any arguments to clear specific entities is deprecated and will not be supported in Doctrine ORM 3.0.',
+                'Calling '.__METHOD__.'() with any arguments to clear specific entities is deprecated and will not be supported in Doctrine ORM 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -670,7 +670,7 @@ 
      */
     public function detach($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()', $entity);
@@ -695,7 +695,7 @@ 
      */
     public function merge($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()', $entity);
@@ -711,7 +711,7 @@ 
      */
     public function copy($entity, $deep = false)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine ORM 3.0.', E_USER_DEPRECATED);
 
         throw new \BadMethodCallException("Not implemented.");
     }
@@ -785,7 +785,7 @@ 
      */
     public function isOpen()
     {
-        return (!$this->closed);
+        return ( ! $this->closed);
     }
 
     /**
@@ -896,7 +896,7 @@ 
                 sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     is_object($connection) ? get_class($connection) : gettype($connection),
-                    is_object($connection) ? '' : ': "' . $connection . '"'
+                    is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }
@@ -946,13 +946,13 @@ 
     {
         switch ($lockMode) {
             case LockMode::OPTIMISTIC:
-                if (!$class->isVersioned) {
+                if ( ! $class->isVersioned) {
                     throw OptimisticLockException::notVersioned($class->name);
                 }
                 break;
             case LockMode::PESSIMISTIC_READ:
             case LockMode::PESSIMISTIC_WRITE:
-                if (!$this->getConnection()->isTransactionActive()) {
+                if ( ! $this->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
         }

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +6 added lines, -6 removed lines

@@ -60,9 +60,9 @@ 
      */
     public function __construct($case = CASE_LOWER, bool $numberAware = false)
     {
-        if (! $numberAware) {
+        if ( ! $numberAware) {
             @trigger_error(
-                'Creating ' . self::class . ' without making it number aware is deprecated and will be removed in Doctrine ORM 3.0.',
+                'Creating '.self::class.' without making it number aware is deprecated and will be removed in Doctrine ORM 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -125,7 +125,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -141,7 +141,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }
 

tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
         parent::setUp();
 
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'mysql') {
-            $this->markTestSkipped('The ' . __CLASS__ .' requires the use of mysql.');
+            $this->markTestSkipped('The '.__CLASS__.' requires the use of mysql.');
         }
     }
 
@@ -46,14 +46,14 @@ 
         $sql = $tool->getCreateSchemaSql($classes);
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
 
-        $this->assertEquals('CREATE TABLE cms_groups (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
-        $this->assertEquals('CREATE TABLE cms_users (id INT AUTO_INCREMENT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_3AF03EC5F85E0677 (username), UNIQUE INDEX UNIQ_3AF03EC5A832C1C9 (email_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[1]);
-        $this->assertEquals('CREATE TABLE cms_users_groups (user_id INT NOT NULL, group_id INT NOT NULL, INDEX IDX_7EA9409AA76ED395 (user_id), INDEX IDX_7EA9409AFE54D947 (group_id), PRIMARY KEY(user_id, group_id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[2]);
-        $this->assertEquals('CREATE TABLE cms_users_tags (user_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_93F5A1ADA76ED395 (user_id), INDEX IDX_93F5A1ADBAD26311 (tag_id), PRIMARY KEY(user_id, tag_id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[3]);
-        $this->assertEquals('CREATE TABLE cms_tags (id INT AUTO_INCREMENT NOT NULL, tag_name VARCHAR(50) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[4]);
-        $this->assertEquals('CREATE TABLE cms_addresses (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, UNIQUE INDEX UNIQ_ACAC157BA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[5]);
-        $this->assertEquals('CREATE TABLE cms_emails (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(250) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[6]);
-        $this->assertEquals('CREATE TABLE cms_phonenumbers (phonenumber VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, INDEX IDX_F21F790FA76ED395 (user_id), PRIMARY KEY(phonenumber)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[7]);
+        $this->assertEquals('CREATE TABLE cms_groups (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
+        $this->assertEquals('CREATE TABLE cms_users (id INT AUTO_INCREMENT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_3AF03EC5F85E0677 (username), UNIQUE INDEX UNIQ_3AF03EC5A832C1C9 (email_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[1]);
+        $this->assertEquals('CREATE TABLE cms_users_groups (user_id INT NOT NULL, group_id INT NOT NULL, INDEX IDX_7EA9409AA76ED395 (user_id), INDEX IDX_7EA9409AFE54D947 (group_id), PRIMARY KEY(user_id, group_id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[2]);
+        $this->assertEquals('CREATE TABLE cms_users_tags (user_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_93F5A1ADA76ED395 (user_id), INDEX IDX_93F5A1ADBAD26311 (tag_id), PRIMARY KEY(user_id, tag_id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[3]);
+        $this->assertEquals('CREATE TABLE cms_tags (id INT AUTO_INCREMENT NOT NULL, tag_name VARCHAR(50) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[4]);
+        $this->assertEquals('CREATE TABLE cms_addresses (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, UNIQUE INDEX UNIQ_ACAC157BA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[5]);
+        $this->assertEquals('CREATE TABLE cms_emails (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(250) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[6]);
+        $this->assertEquals('CREATE TABLE cms_phonenumbers (phonenumber VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, INDEX IDX_F21F790FA76ED395 (user_id), PRIMARY KEY(phonenumber)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[7]);
         $this->assertEquals("ALTER TABLE cms_users ADD CONSTRAINT FK_3AF03EC5A832C1C9 FOREIGN KEY (email_id) REFERENCES cms_emails (id)", $sql[8]);
         $this->assertEquals("ALTER TABLE cms_users_groups ADD CONSTRAINT FK_7EA9409AA76ED395 FOREIGN KEY (user_id) REFERENCES cms_users (id)", $sql[9]);
         $this->assertEquals("ALTER TABLE cms_users_groups ADD CONSTRAINT FK_7EA9409AFE54D947 FOREIGN KEY (group_id) REFERENCES cms_groups (id)", $sql[10]);
@@ -85,7 +85,7 @@ 
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
 
         $this->assertEquals(1, count($sql));
-        $this->assertEquals('CREATE TABLE decimal_model (id INT AUTO_INCREMENT NOT NULL, `decimal` NUMERIC(5, 2) NOT NULL, `high_scale` NUMERIC(14, 4) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
+        $this->assertEquals('CREATE TABLE decimal_model (id INT AUTO_INCREMENT NOT NULL, `decimal` NUMERIC(5, 2) NOT NULL, `high_scale` NUMERIC(14, 4) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
     }
 
     public function testGetCreateSchemaSql3()
@@ -99,7 +99,7 @@ 
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
 
         $this->assertEquals(1, count($sql));
-        $this->assertEquals('CREATE TABLE boolean_model (id INT AUTO_INCREMENT NOT NULL, booleanField TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
+        $this->assertEquals('CREATE TABLE boolean_model (id INT AUTO_INCREMENT NOT NULL, booleanField TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
     }
 
     /**
@@ -146,7 +146,7 @@ 
             ['/^(?!entity_to_r)/', null],
             [
                 null,
-                static function ($assetName) : bool {
+                static function($assetName) : bool {
                     return $assetName !== 'entity_to_remove';
                 },
             ],
@@ -187,7 +187,7 @@ 
 
     private function filterSqls(array $sqls, array $needles) : array
     {
-        return array_filter($sqls, static function ($sql) use ($needles) {
+        return array_filter($sqls, static function($sql) use ($needles) {
             foreach ($needles as $needle) {
                 if (strpos($sql, $needle) !== false) {
                     return true;

tests/Doctrine/Tests/ORM/Functional/SchemaTool/SqliteSchemaToolTest.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
         parent::setUp();
 
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'sqlite') {
-            $this->markTestSkipped('The ' . self::class . ' requires the use of sqlite.');
+            $this->markTestSkipped('The '.self::class.' requires the use of sqlite.');
         }
     }
 
@@ -34,7 +34,7 @@ 
 
     private function filterCreateTable(array $sqls, string $tableName) : array
     {
-        return array_filter($sqls, static function (string $sql) use ($tableName) : bool {
+        return array_filter($sqls, static function(string $sql) use ($tableName) : bool {
             return strpos($sql, sprintf('CREATE TABLE %s (', $tableName)) === 0;
         });
     }
@@ -51,7 +51,7 @@ 
 
         $this->_em->getConnection()->exec(current($sqls));
         $sqls = $tool->getUpdateSchemaSql($classes);
-        $sqls = array_filter($sqls, static function (string $sql) : bool {
+        $sqls = array_filter($sqls, static function(string $sql) : bool {
             return (bool) strpos($sql, 'my_entity');
         });
         $this->assertCount(0, $sqls);
@@ -68,7 +68,7 @@ 
             ['/^(?!my_enti)/', null],
             [
                 null,
-                static function ($assetName) : bool {
+                static function($assetName) : bool {
                     return $assetName !== 'my_entity';
                 },
             ],
@@ -97,7 +97,7 @@ 
         }
 
         $sqls = $tool->getUpdateSchemaSql($classes);
-        $sqls = array_filter($sqls, static function (string $sql) : bool {
+        $sqls = array_filter($sqls, static function(string $sql) : bool {
             return (bool) strpos($sql, 'my_entity');
         });
         self::assertCount(0, $sqls);

tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
         parent::setUp();
 
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'postgresql') {
-            $this->markTestSkipped('The ' . __CLASS__ .' requires the use of postgresql.');
+            $this->markTestSkipped('The '.__CLASS__.' requires the use of postgresql.');
         }
     }
 
@@ -153,7 +153,7 @@ 
             ['/^(?!pg_entity_to_r)/', null],
             [
                 null,
-                static function ($assetName) : bool {
+                static function($assetName) : bool {
                     return $assetName !== 'pg_entity_to_remove';
                 },
             ],
@@ -182,7 +182,7 @@ 
         }
 
         $sqls = $tool->getUpdateSchemaSql($classes);
-        $sqls = array_filter($sqls, static function ($sql) {
+        $sqls = array_filter($sqls, static function($sql) {
             return strpos($sql, 'pg_entity_to_remove') !== false;
         });
         self::assertCount(0, $sqls);

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +7 added lines, -7 removed lines

@@ -228,7 +228,7 @@ 
                             $targetEntity = current(
                                 array_filter(
                                     $classes,
-                                    function (ClassMetadata $class) use ($idMapping) : bool {
+                                    function(ClassMetadata $class) use ($idMapping) : bool {
                                         return $class->name === $idMapping['targetEntity'];
                                     }
                                 )
@@ -648,8 +648,8 @@ 
 
             if ( ! $definingClass) {
                 throw new \Doctrine\ORM\ORMException(
-                    'Column name `' . $joinColumn['referencedColumnName'] . '` referenced for relation from '
-                    . $mapping['sourceEntity'] . ' towards ' . $mapping['targetEntity'] . ' does not exist.'
+                    'Column name `'.$joinColumn['referencedColumnName'].'` referenced for relation from '
+                    . $mapping['sourceEntity'].' towards '.$mapping['targetEntity'].' does not exist.'
                 );
             }
 
@@ -713,7 +713,7 @@ 
 
         $compositeName = $theJoinTable->getName().'.'.implode('', $localColumns);
 
-        if (! $this->platform->supportsForeignKeyConstraints()) {
+        if ( ! $this->platform->supportsForeignKeyConstraints()) {
             return;
         }
 
@@ -749,7 +749,7 @@ 
      */
     private function gatherColumnOptions(array $mapping) : array
     {
-        if (! isset($mapping['options'])) {
+        if ( ! isset($mapping['options'])) {
             return [];
         }
 
@@ -855,7 +855,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }
@@ -932,7 +932,7 @@ 
         }
 
         // whitelist assets we already know about in $toSchema, use the existing filter otherwise
-        $config->setSchemaAssetsFilter(static function ($asset) use ($filter, $toSchema) : bool {
+        $config->setSchemaAssetsFilter(static function($asset) use ($filter, $toSchema) : bool {
             $assetName = $asset instanceof AbstractAsset ? $asset->getName() : $asset;
 
             return $toSchema->hasTable($assetName) || $toSchema->hasSequence($assetName) || $filter($asset);