Completed
Pull Request — master (#5669)
by Jeremy
48:42 queued 40:04
created
lib/Doctrine/ORM/Proxy/ProxyFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     {
126 126
         $wakeupProxy = $classMetadata->getReflectionClass()->hasMethod('__wakeup');
127 127
 
128
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
128
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
129 129
             $initializer = $proxy->__getInitializer();
130 130
             $cloner      = $proxy->__getCloner();
131 131
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
      */
178 178
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
179 179
     {
180
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
180
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata) {
181 181
             if ($proxy->__isInitialized()) {
182 182
                 return;
183 183
             }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityManager.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -839,7 +839,7 @@
 block discarded – undo
839 839
 
840 840
             case ($conn instanceof Connection):
841 841
                 if ($eventManager !== null && $conn->getEventManager() !== $eventManager) {
842
-                     throw ORMException::mismatchedEventManager();
842
+                        throw ORMException::mismatchedEventManager();
843 843
                 }
844 844
                 break;
845 845
 
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
      */
224 224
     public function transactional($func)
225 225
     {
226
-        if (!is_callable($func)) {
227
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
226
+        if ( ! is_callable($func)) {
227
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
228 228
         }
229 229
 
230 230
         $this->conn->beginTransaction();
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
      */
748 748
     public function isOpen()
749 749
     {
750
-        return (!$this->closed);
750
+        return ( ! $this->closed);
751 751
     }
752 752
 
753 753
     /**
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
                 break;
845 845
 
846 846
             default:
847
-                throw new \InvalidArgumentException("Invalid argument: " . $conn);
847
+                throw new \InvalidArgumentException("Invalid argument: ".$conn);
848 848
         }
849 849
 
850 850
         return new EntityManager($conn, $config, $conn->getEventManager());
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultCache.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
      */
46 46
     private $uow;
47 47
 
48
-     /**
49
-     * @var \Doctrine\ORM\Cache\CacheFactory
50
-     */
48
+        /**
49
+         * @var \Doctrine\ORM\Cache\CacheFactory
50
+         */
51 51
     private $cacheFactory;
52 52
 
53 53
     /**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
         return $this->queryCaches[$regionName];
290 290
     }
291 291
 
292
-     /**
293
-     * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
294
-     * @param mixed                               $identifier The entity identifier.
295
-     *
296
-     * @return \Doctrine\ORM\Cache\EntityCacheKey
297
-     */
292
+        /**
293
+         * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
294
+         * @param mixed                               $identifier The entity identifier.
295
+         *
296
+         * @return \Doctrine\ORM\Cache\EntityCacheKey
297
+         */
298 298
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
299 299
     {
300 300
         if ( ! is_array($identifier)) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -278,8 +278,7 @@  discard block
 block discarded – undo
278 278
     public function getQueryCache($regionName = null)
279 279
     {
280 280
         if ($regionName === null) {
281
-            return $this->defaultQueryCache ?:
282
-                $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
281
+            return $this->defaultQueryCache ?: $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
283 282
         }
284 283
 
285 284
         if ( ! isset($this->queryCaches[$regionName])) {
@@ -314,7 +313,7 @@  discard block
 block discarded – undo
314 313
     private function buildCollectionCacheKey(ClassMetadata $metadata, $association, $ownerIdentifier)
315 314
     {
316 315
         if ( ! is_array($ownerIdentifier)) {
317
-            $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier);;
316
+            $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier); ;
318 317
         }
319 318
 
320 319
         return new CollectionCacheKey($metadata->rootEntityName, $association, $ownerIdentifier);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/CacheConfiguration.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
      */
74 74
     public function getCacheLogger()
75 75
     {
76
-         return $this->cacheLogger;
76
+            return $this->cacheLogger;
77 77
     }
78 78
 
79 79
     /**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
             $this->queryValidator = new TimestampQueryCacheValidator();
114 114
         }
115 115
 
116
-         return $this->queryValidator;
116
+            return $this->queryValidator;
117 117
     }
118 118
 
119 119
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultCacheFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -217,12 +217,12 @@
 block discarded – undo
217 217
 
218 218
             if ( ! $this->fileLockRegionDirectory) {
219 219
                 throw new \LogicException(
220
-                    'If you what to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
220
+                    'If you what to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
221 221
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you what to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
222 222
                 );
223 223
             }
224 224
 
225
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
225
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
226 226
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
227 227
         }
228 228
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Region/DefaultRegion.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      */
125 125
     protected function getCacheEntryKey(CacheKey $key)
126 126
     {
127
-        return $this->name . self::REGION_KEY_SEPARATOR . $key->hash;
127
+        return $this->name.self::REGION_KEY_SEPARATOR.$key->hash;
128 128
     }
129 129
 
130 130
     /**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      */
149 149
     public function evictAll()
150 150
     {
151
-        if (! $this->cache instanceof ClearableCache) {
151
+        if ( ! $this->cache instanceof ClearableCache) {
152 152
             throw new \BadMethodCallException(sprintf(
153 153
                 'Clearing all cache entries is not supported by the supplied cache adapter of type %s',
154 154
                 get_class($this->cache)
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Region/FileLockRegion.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
      */
119 119
     private function getLockFileName(CacheKey $key)
120 120
     {
121
-        return $this->directory . DIRECTORY_SEPARATOR . $key->hash . '.' . self::LOCK_EXTENSION;
121
+        return $this->directory.DIRECTORY_SEPARATOR.$key->hash.'.'.self::LOCK_EXTENSION;
122 122
     }
123 123
 
124 124
     /**
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
     {
217 217
         // The check below is necessary because on some platforms glob returns false
218 218
         // when nothing matched (even though no errors occurred)
219
-        $filenames = glob(sprintf("%s/*.%s" , $this->directory, self::LOCK_EXTENSION));
219
+        $filenames = glob(sprintf("%s/*.%s", $this->directory, self::LOCK_EXTENSION));
220 220
 
221 221
         if ($filenames) {
222 222
             foreach ($filenames as $filename) {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -211,6 +211,7 @@
 block discarded – undo
211 211
 
212 212
     /**
213 213
      * {@inheritdoc}
214
+     * @return boolean
214 215
      */
215 216
     public function evictAll()
216 217
     {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultQueryCache.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
  */
39 39
 class DefaultQueryCache implements QueryCache
40 40
 {
41
-     /**
42
-     * @var \Doctrine\ORM\EntityManagerInterface
43
-     */
41
+        /**
42
+         * @var \Doctrine\ORM\EntityManagerInterface
43
+         */
44 44
     private $em;
45 45
 
46 46
     /**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
 
131 131
             if ( ! $hasRelation) {
132 132
 
133
-                $result[$index]  = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints);
133
+                $result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints);
134 134
 
135 135
                 continue;
136 136
             }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 
110 110
                     $targetAssoc = $targetClassMetadata->associationMappings[$fieldName];
111 111
 
112
-                    foreach($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
112
+                    foreach ($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
113 113
                         if (isset($targetAssoc['sourceToTargetKeyColumns'][$referencedColumn])) {
114 114
                             $data[$localColumn] = $fieldValue;
115 115
                         }
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
         }
162 162
 
163 163
         foreach ($metadata->associationMappings as $name => $assoc) {
164
-            if ( ! isset($assoc['cache']) ||  ! isset($data[$name])) {
164
+            if ( ! isset($assoc['cache']) || ! isset($data[$name])) {
165 165
                 continue;
166 166
             }
167 167
 
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,6 @@
 block discarded – undo
21 21
 
22 22
 use Doctrine\Common\Collections\ArrayCollection;
23 23
 use Doctrine\Common\Collections\Criteria;
24
-
25 24
 use Doctrine\ORM\Query\Expr;
26 25
 use Doctrine\ORM\Query\QueryExpressionVisitor;
27 26
 
Please login to merge, or discard this patch.