doctrine / orm

tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php

Spacing +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
         $this->_em->flush();
         $this->_em->clear(CmsUser::class);
 
-        $dql = 'SELECT u FROM ' . CmsUser::class . ' u WHERE u.id = ?1';
+        $dql = 'SELECT u FROM '.CmsUser::class.' u WHERE u.id = ?1';
         $query = $this->_em->createQuery($dql);
         $query->setParameter(1, $user);
 
@@ -226,7 +226,7 @@ 
 
         $this->_em->clear(CmsArticle::class);
 
-        $sql = 'UPDATE cms_articles SET version = version + 1 WHERE id = ' . $article->id;
+        $sql = 'UPDATE cms_articles SET version = version + 1 WHERE id = '.$article->id;
         $this->_em->getConnection()->executeUpdate($sql);
 
         $this->expectException(OptimisticLockException::class);

tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
                 $this->_em->getClassMetadata(DDC3027Dog::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -82,7 +82,7 @@ 
         $this->assertEquals('United States of America', $person->address->country->name);
 
         // 4. check deleting works
-        $personId = $person->id;;
+        $personId = $person->id; ;
         $this->_em->remove($person);
         $this->_em->flush();
 
@@ -106,7 +106,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getResult();
 
         $this->assertCount(3, $persons);
@@ -119,7 +119,7 @@ 
             $this->assertEquals('United States of America', $person->address->country->name);
         }
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getArrayResult();
 
         foreach ($persons as $person) {
@@ -144,7 +144,7 @@ 
         $this->_em->flush();
 
         // SELECT
-        $selectDql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
+        $selectDql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
         $loadedPerson = $this->_em->createQuery($selectDql)
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'Germany')
@@ -159,7 +159,7 @@ 
         );
 
         // UPDATE
-        $updateDql = "UPDATE " . __NAMESPACE__ . "\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
+        $updateDql = "UPDATE ".__NAMESPACE__."\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
         $this->_em->createQuery($updateDql)
             ->setParameter('street', 'Boo')
             ->setParameter('country', 'DE')
@@ -171,7 +171,7 @@ 
         $this->assertEquals('DE', $person->address->country->name);
 
         // DELETE
-        $this->_em->createQuery("DELETE " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
+        $this->_em->createQuery("DELETE ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'DE')
             ->execute();
@@ -188,7 +188,7 @@ 
         $this->_em->clear();
 
         // Prove that the entity was persisted correctly.
-        $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -202,7 +202,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{id,address.city} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -218,7 +218,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{address.city, id} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -237,7 +237,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('no field or association named address.asdfasdf');
 
-        $this->_em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
+        $this->_em->createQuery("SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
             ->execute();
     }
 
@@ -246,7 +246,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage("no mapped field named 'address.asdfasdf'");
 
-        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM " . __NAMESPACE__ . "\\DDC93Person p")
+        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM ".__NAMESPACE__."\\DDC93Person p")
             ->execute();
     }
 
@@ -308,15 +308,15 @@ 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
             sprintf(
-                'Infinite nesting detected for embedded property %s::nested. ' .
+                'Infinite nesting detected for embedded property %s::nested. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
-                __NAMESPACE__ . '\\' . $declaredEmbeddableClassName
+                __NAMESPACE__.'\\'.$declaredEmbeddableClassName
             )
         );
 
         $this->_schemaTool->createSchema(
             [
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName),
+            $this->_em->getClassMetadata(__NAMESPACE__.'\\'.$embeddableClassName),
             ]
         );
     }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $this->_em->persist($user);
         $this->_em->flush();
 
-        $repository = $this->_em->getRepository(__NAMESPACE__ . "\DDC2984User");
+        $repository = $this->_em->getRepository(__NAMESPACE__."\DDC2984User");
 
         $sameUser = $repository->find(new DDC2984DomainUserId('unique_id_within_a_vo'));
 

lib/Doctrine/ORM/EntityManager.php

Spacing +8 added lines, -8 removed lines

@@ -224,8 +224,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();
@@ -355,7 +355,7 @@ 
     {
         if (func_num_args() !== 0) {
             @trigger_error(
-                'Calling ' . __METHOD__ . '() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine 3.0.',
+                'Calling '.__METHOD__.'() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -664,7 +664,7 @@ 
      */
     public function detach($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()', $entity);
@@ -689,7 +689,7 @@ 
      */
     public function merge($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()', $entity);
@@ -707,7 +707,7 @@ 
      */
     public function copy($entity, $deep = false)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         throw new \BadMethodCallException("Not implemented.");
     }
@@ -781,7 +781,7 @@ 
      */
     public function isOpen()
     {
-        return (!$this->closed);
+        return ( ! $this->closed);
     }
 
     /**
@@ -892,7 +892,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.'"'
                 )
             );
         }

lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $ui = new SymfonyStyle($input, $output);
-        $ui->warning('Command ' . $this->getName() . ' is deprecated and will be removed in Doctrine 3.0.');
+        $ui->warning('Command '.$this->getName().' is deprecated and will be removed in Doctrine 3.0.');
 
         $em = $this->getHelper('em')->getEntityManager();
 

lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $ui = new SymfonyStyle($input, $output);
-        $ui->warning('Command ' . $this->getName() . ' is deprecated and will be removed in Doctrine 3.0.');
+        $ui->warning('Command '.$this->getName().' is deprecated and will be removed in Doctrine 3.0.');
 
         // Process source directories
         $fromPaths = array_merge([$input->getArgument('from-path')], $input->getOption('from'));
@@ -202,7 +202,7 @@ 
             $exporter->setMetadata($metadata);
             $exporter->export();
 
-            $output->writeln(PHP_EOL . sprintf(
+            $output->writeln(PHP_EOL.sprintf(
                 'Converting Doctrine 1.X schema to "<info>%s</info>" mapping type in "<info>%s</info>"', $toType, $destPath
             ));
         } else {

lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $ui = new SymfonyStyle($input, $output);
-        $ui->warning('Command ' . $this->getName() . ' is deprecated and will be removed in Doctrine 3.0.');
+        $ui->warning('Command '.$this->getName().' is deprecated and will be removed in Doctrine 3.0.');
 
         $em = $this->getHelper('em')->getEntityManager();
 
@@ -125,7 +125,7 @@ 
         $entityGenerator->setRegenerateEntityIfExists($input->getOption('regenerate-entities'));
         $entityGenerator->setUpdateEntityIfExists($input->getOption('update-entities'));
         $entityGenerator->setNumSpaces($input->getOption('num-spaces'));
-        $entityGenerator->setBackupExisting(!$input->getOption('no-backup'));
+        $entityGenerator->setBackupExisting( ! $input->getOption('no-backup'));
 
         if (($extend = $input->getOption('extend')) !== null) {
             $entityGenerator->setClassToExtend($extend);

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
      */
     public function __construct($dir = null)
     {
-        @trigger_error(static::class . ' is deprecated and will be removed in Doctrine 3.0', E_USER_DEPRECATED);
+        @trigger_error(static::class.' is deprecated and will be removed in Doctrine 3.0', E_USER_DEPRECATED);
 
         $this->_outputDir = $dir;
     }
@@ -145,7 +145,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);
@@ -163,7 +163,7 @@ 
      */
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
     }
 
     /**