Completed
Pull Request — 2.8.x (#8130)
by Gabriel
07:41
created
tests/Doctrine/Tests/ORM/Functional/TypeTest.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         $this->assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));
127 127
 
128 128
         $articles = $this->_em->getRepository(DateTimeModel::class)
129
-                              ->findBy(['datetime' => new \DateTime()]);
129
+                                ->findBy(['datetime' => new \DateTime()]);
130 130
 
131 131
         $this->assertEmpty($articles);
132 132
     }
@@ -162,11 +162,11 @@  discard block
 block discarded – undo
162 162
         $this->_em->clear();
163 163
 
164 164
         $dateTimeDb = $this->_em->createQueryBuilder()
165
-                                 ->select('d')
166
-                                 ->from(DateTimeModel::class, 'd')
167
-                                 ->where('d.datetime = ?1')
168
-                                 ->setParameter(1, $date, DBALType::DATETIME)
169
-                                 ->getQuery()->getSingleResult();
165
+                                    ->select('d')
166
+                                    ->from(DateTimeModel::class, 'd')
167
+                                    ->where('d.datetime = ?1')
168
+                                    ->setParameter(1, $date, DBALType::DATETIME)
169
+                                    ->getQuery()->getSingleResult();
170 170
 
171 171
         $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime);
172 172
         $this->assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         $this->_em->flush();
30 30
         $this->_em->clear();
31 31
 
32
-        $dql = 'SELECT d FROM ' . DecimalModel::class . ' d';
32
+        $dql = 'SELECT d FROM '.DecimalModel::class.' d';
33 33
         $decimal = $this->_em->createQuery($dql)->getSingleResult();
34 34
 
35 35
         $this->assertSame('0.15', $decimal->decimal);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $this->_em->flush();
50 50
         $this->_em->clear();
51 51
 
52
-        $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = true';
52
+        $dql = 'SELECT b FROM '.BooleanModel::class.' b WHERE b.booleanField = true';
53 53
         $bool = $this->_em->createQuery($dql)->getSingleResult();
54 54
 
55 55
         $this->assertTrue($bool->booleanField);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         $this->_em->flush();
60 60
         $this->_em->clear();
61 61
 
62
-        $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = false';
62
+        $dql = 'SELECT b FROM '.BooleanModel::class.' b WHERE b.booleanField = false';
63 63
         $bool = $this->_em->createQuery($dql)->getSingleResult();
64 64
 
65 65
         $this->assertFalse($bool->booleanField);
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         $this->_em->flush();
76 76
         $this->_em->clear();
77 77
 
78
-        $dql = 'SELECT s FROM ' . SerializationModel::class . ' s';
78
+        $dql = 'SELECT s FROM '.SerializationModel::class.' s';
79 79
         $serialize = $this->_em->createQuery($dql)->getSingleResult();
80 80
 
81 81
         $this->assertSame(["foo" => "bar", "bar" => "baz"], $serialize->array);
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         $this->_em->flush();
91 91
         $this->_em->clear();
92 92
 
93
-        $dql = 'SELECT s FROM ' . SerializationModel::class . ' s';
93
+        $dql = 'SELECT s FROM '.SerializationModel::class.' s';
94 94
         $serialize = $this->_em->createQuery($dql)->getSingleResult();
95 95
 
96 96
         $this->assertInstanceOf('stdClass', $serialize->object);
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $this->assertEquals('FOO', $this->_em->getConnection()->fetchColumn("select named_lower_case_string from customtype_uppercases where id=".$entity->id.""), 'Database holds uppercase string');
71 71
 
72 72
 
73
-        $entity->namedLowerCaseString   = 'bar';
73
+        $entity->namedLowerCaseString = 'bar';
74 74
 
75 75
         $this->_em->persist($entity);
76 76
         $this->_em->flush();
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
         $this->_em->clear();
130 130
 
131
-        $query = $this->_em->createQuery("SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = " . $parentId);
131
+        $query = $this->_em->createQuery("SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = ".$parentId);
132 132
 
133 133
         $result = $query->getResult();
134 134
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
  */
17 17
 class ResultCacheTest extends OrmFunctionalTestCase
18 18
 {
19
-   /**
19
+    /**
20 20
      * @var \ReflectionProperty
21 21
      */
22 22
     private $cacheDataReflection;
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
         parent::setUp();
25 25
         $this->_factory = new ProxyFactory(
26 26
                 $this->_em,
27
-                __DIR__ . '/../../Proxies',
27
+                __DIR__.'/../../Proxies',
28 28
                 'Doctrine\Tests\Proxies',
29 29
                 true);
30 30
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     {
69 69
         $id = $this->createProduct();
70 70
 
71
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
71
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
72 72
         $class = $this->_em->getClassMetadata(get_class($entity));
73 73
 
74 74
         $this->assertEquals(ECommerceProduct::class, $class->name);
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
     {
82 82
         $id = $this->createProduct();
83 83
 
84
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
85
-        $entity2 = $this->_em->find(ECommerceProduct::class , $id);
84
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
85
+        $entity2 = $this->_em->find(ECommerceProduct::class, $id);
86 86
 
87 87
         $this->assertSame($entity, $entity2);
88 88
         $this->assertEquals('Doctrine Cookbook', $entity2->getName());
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         $id = $this->createProduct();
97 97
 
98 98
         /* @var $entity ECommerceProduct */
99
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
99
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
100 100
 
101 101
         /* @var $clone ECommerceProduct */
102 102
         $clone = clone $entity;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $id = $this->createProduct();
122 122
 
123 123
         /* @var $entity ECommerceProduct */
124
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
124
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
125 125
 
126 126
         $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
127 127
         $this->_em->getUnitOfWork()->initializeObject($entity);
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
         $id = $this->createProduct();
137 137
 
138 138
         /* @var $entity ECommerceProduct */
139
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
139
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
140 140
         $entity->setName('Doctrine 2 Cookbook');
141 141
 
142 142
         $this->_em->flush();
143 143
         $this->_em->clear();
144 144
 
145
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
145
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
146 146
         $this->assertEquals('Doctrine 2 Cookbook', $entity->getName());
147 147
     }
148 148
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         $id = $this->createProduct();
155 155
 
156 156
         /* @var $entity ECommerceProduct */
157
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
157
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
158 158
 
159 159
         $this->assertFalse($entity->wakeUp);
160 160
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         $id = $this->createProduct();
169 169
 
170 170
         /* @var $entity ECommerceProduct */
171
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
171
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
172 172
 
173 173
         $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
174 174
         $this->assertEquals($id, $entity->getId());
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
         $id = $this->createAuction();
184 184
 
185 185
         /* @var $entity CompanyAuction */
186
-        $entity = $this->_em->getReference(CompanyAuction::class , $id);
186
+        $entity = $this->_em->getReference(CompanyAuction::class, $id);
187 187
 
188 188
         $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
189 189
         $this->assertEquals($id, $entity->getId());
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
         $id = $this->createProduct();
219 219
 
220 220
         /* @var $entity ECommerceProduct */
221
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
221
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
222 222
 
223 223
         $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
224 224
         $this->assertEquals('Doctrine Cookbook', $entity->getName());
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
         $id = $this->createProduct();
234 234
 
235 235
         /* @var $entity ECommerceProduct */
236
-        $entity = $this->_em->getReference(ECommerceProduct::class , $id);
236
+        $entity = $this->_em->getReference(ECommerceProduct::class, $id);
237 237
         $className = ClassUtils::getClass($entity);
238 238
 
239 239
         $this->assertInstanceOf(Proxy::class, $entity);
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
         $this->assertEquals(ECommerceProduct::class, $className);
242 242
 
243 243
         $restName = str_replace($this->_em->getConfiguration()->getProxyNamespace(), "", get_class($entity));
244
-        $restName = substr(get_class($entity), strlen($this->_em->getConfiguration()->getProxyNamespace()) +1);
245
-        $proxyFileName = $this->_em->getConfiguration()->getProxyDir() . DIRECTORY_SEPARATOR . str_replace("\\", "", $restName) . ".php";
244
+        $restName = substr(get_class($entity), strlen($this->_em->getConfiguration()->getProxyNamespace()) + 1);
245
+        $proxyFileName = $this->_em->getConfiguration()->getProxyDir().DIRECTORY_SEPARATOR.str_replace("\\", "", $restName).".php";
246 246
         $this->assertTrue(file_exists($proxyFileName), "Proxy file name cannot be found generically.");
247 247
 
248 248
         $entity->__load();
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
         $worker->addFunction("dqlWithLock", [$lockAgent, "dqlWithLock"]);
25 25
         $worker->addFunction('lock', [$lockAgent, 'lock']);
26 26
 
27
-        while($worker->work()) {
27
+        while ($worker->work()) {
28 28
             if ($worker->returnCode() != GEARMAN_SUCCESS) {
29
-                echo "return_code: " . $worker->returnCode() . "\n";
29
+                echo "return_code: ".$worker->returnCode()."\n";
30 30
                 break;
31 31
             }
32 32
         }
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 
78 78
     protected function processWorkload($job)
79 79
     {
80
-        echo "Received job: " . $job->handle() . " for function " . $job->functionName() . "\n";
80
+        echo "Received job: ".$job->handle()." for function ".$job->functionName()."\n";
81 81
 
82 82
         $workload = $job->workload();
83 83
         $workload = unserialize($workload);
84 84
 
85
-        if (!isset($workload['conn']) || !is_array($workload['conn'])) {
85
+        if ( ! isset($workload['conn']) || ! is_array($workload['conn'])) {
86 86
             throw new \InvalidArgumentException("Missing Database parameters");
87 87
         }
88 88
 
89 89
         $this->em = $this->createEntityManager($workload['conn']);
90 90
 
91
-        if (!isset($workload['fixture'])) {
91
+        if ( ! isset($workload['fixture'])) {
92 92
             throw new \InvalidArgumentException("Missing Fixture parameters");
93 93
         }
94 94
         return $workload['fixture'];
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
     protected function createEntityManager($conn)
98 98
     {
99 99
         $config = new Configuration();
100
-        $config->setProxyDir(__DIR__ . '/../../../Proxies');
100
+        $config->setProxyDir(__DIR__.'/../../../Proxies');
101 101
         $config->setProxyNamespace('MyProject\Proxies');
102 102
         $config->setAutoGenerateProxyClasses(true);
103 103
 
104
-        $annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/'], true);
104
+        $annotDriver = $config->newDefaultAnnotationDriver([__DIR__.'/../../../Models/'], true);
105 105
         $config->setMetadataDriverImpl($annotDriver);
106 106
 
107 107
         $cache = new ArrayCache();
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function setUp()
19 19
     {
20
-        if (!class_exists('GearmanClient', false)) {
20
+        if ( ! class_exists('GearmanClient', false)) {
21 21
             $this->markTestSkipped('pecl/gearman is required for this test to run.');
22 22
         }
23 23
 
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
         $this->gearman->runTasks();
134 134
 
135 135
         $this->assertTrue($this->maxRunTime > $forTime,
136
-            "Because of locking this tests should have run at least " . $forTime . " seconds, ".
137
-            "but only did for " . $this->maxRunTime . " seconds.");
136
+            "Because of locking this tests should have run at least ".$forTime." seconds, ".
137
+            "but only did for ".$this->maxRunTime." seconds.");
138 138
         $this->assertTrue($this->maxRunTime < $notLongerThan,
139
-            "The longest task should not run longer than " . $notLongerThan . " seconds, ".
140
-            "but did for " . $this->maxRunTime . " seconds."
139
+            "The longest task should not run longer than ".$notLongerThan." seconds, ".
140
+            "but did for ".$this->maxRunTime." seconds."
141 141
         );
142 142
     }
143 143
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@
 block discarded – undo
206 206
         $this->expectExceptionMessage('The optimistic lock on an entity failed.');
207 207
 
208 208
         $this->_em->createQuery($dql)
209
-                  ->setHint(Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC)
210
-                  ->getSQL();
209
+                    ->setHint(Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC)
210
+                    ->getSQL();
211 211
     }
212 212
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         $article = new CmsArticle();
88 88
 
89 89
         $this->expectException(\InvalidArgumentException::class);
90
-        $this->expectExceptionMessage('Entity ' . CmsArticle::class);
90
+        $this->expectExceptionMessage('Entity '.CmsArticle::class);
91 91
 
92 92
         $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version + 1);
93 93
     }
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
     {
137 137
         $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL();
138 138
 
139
-        if (! $writeLockSql) {
139
+        if ( ! $writeLockSql) {
140 140
             $this->markTestSkipped('Database Driver has no Write Lock support.');
141 141
         }
142 142
 
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
             throw $e;
157 157
         }
158 158
 
159
-        $query = array_pop( $this->_sqlLoggerStack->queries );
160
-        $query = array_pop( $this->_sqlLoggerStack->queries );
159
+        $query = array_pop($this->_sqlLoggerStack->queries);
160
+        $query = array_pop($this->_sqlLoggerStack->queries);
161 161
         $this->assertContains($writeLockSql, $query['sql']);
162 162
     }
163 163
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
     {
169 169
         $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSQL();
170 170
 
171
-        if (! $readLockSql) {
171
+        if ( ! $readLockSql) {
172 172
             $this->markTestSkipped('Database Driver has no Write Lock support.');
173 173
         }
174 174
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
      */
201 201
     public function testLockOptimisticNonVersionedThrowsExceptionInDQL()
202 202
     {
203
-        $dql = "SELECT u FROM " . CmsUser::class . " u WHERE u.username = 'gblanco'";
203
+        $dql = "SELECT u FROM ".CmsUser::class." u WHERE u.username = 'gblanco'";
204 204
 
205 205
         $this->expectException(OptimisticLockException::class);
206 206
         $this->expectExceptionMessage('The optimistic lock on an entity failed.');
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         $test = new OptimisticStandard();
116 116
 
117 117
         for ($i = 0; $i < 5; $i++) {
118
-            $test->name = 'test' . $i;
118
+            $test->name = 'test'.$i;
119 119
 
120 120
             $this->_em->persist($test);
121 121
             $this->_em->flush();
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         $caughtException = null;
250 250
 
251 251
         try {
252
-            $expectedVersionExpired = DateTime::createFromFormat('U', $test->version->getTimestamp()-3600);
252
+            $expectedVersionExpired = DateTime::createFromFormat('U', $test->version->getTimestamp() - 3600);
253 253
 
254 254
             $this->_em->lock($test, LockMode::OPTIMISTIC, $expectedVersionExpired);
255 255
         } catch (OptimisticLockException $e) {
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToManyTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@
 block discarded – undo
232 232
         $entity     = $this->_em->find(Travel::class, $entitiId);
233 233
 
234 234
         $this->assertEquals(0, $entity->getVisitedCities()->count());
235
-        $this->assertEquals($queryCount+2, $this->getCurrentQueryCount());
235
+        $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount());
236 236
 
237 237
         $this->_em->clear();
238 238
 
Please login to merge, or discard this patch.