Completed
Pull Request — master (#50)
by Jonathan
04:13 queued 01:53
created
lib/Doctrine/Persistence/Mapping/Driver/DefaultFileLocator.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
90 90
      */
91 91
     public function findMappingFile(string $className) : string
92 92
     {
93
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
93
+        $fileName = str_replace('\\', '.', $className).$this->fileExtension;
94 94
 
95 95
         // Check whether file exists
96 96
         foreach ($this->paths as $path) {
97
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
98
-                return $path . DIRECTORY_SEPARATOR . $fileName;
97
+            if (is_file($path.DIRECTORY_SEPARATOR.$fileName)) {
98
+                return $path.DIRECTORY_SEPARATOR.$fileName;
99 99
             }
100 100
         }
101 101
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
         if ($this->paths) {
113 113
             foreach ($this->paths as $path) {
114
-                if (! is_dir($path)) {
114
+                if (!is_dir($path)) {
115 115
                     throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
116 116
                 }
117 117
 
@@ -141,11 +141,11 @@  discard block
 block discarded – undo
141 141
      */
142 142
     public function fileExists(string $className) : bool
143 143
     {
144
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
144
+        $fileName = str_replace('\\', '.', $className).$this->fileExtension;
145 145
 
146 146
         // Check whether file exists
147 147
         foreach ((array) $this->paths as $path) {
148
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
148
+            if (is_file($path.DIRECTORY_SEPARATOR.$fileName)) {
149 149
                 return true;
150 150
             }
151 151
         }
Please login to merge, or discard this patch.
lib/Doctrine/Persistence/Mapping/Driver/AnnotationDriver.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     {
81 81
         $this->reader = $reader;
82 82
 
83
-        if (! $paths) {
83
+        if (!$paths) {
84 84
             return;
85 85
         }
86 86
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
             return $this->classNames;
185 185
         }
186 186
 
187
-        if (! $this->paths) {
187
+        if (!$this->paths) {
188 188
             throw MappingException::pathRequired();
189 189
         }
190 190
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
         $includedFiles = [];
193 193
 
194 194
         foreach ($this->paths as $path) {
195
-            if (! is_dir($path)) {
195
+            if (!is_dir($path)) {
196 196
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
197 197
             }
198 198
 
@@ -201,14 +201,14 @@  discard block
 block discarded – undo
201 201
                     new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
202 202
                     RecursiveIteratorIterator::LEAVES_ONLY
203 203
                 ),
204
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
204
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
205 205
                 RecursiveRegexIterator::GET_MATCH
206 206
             );
207 207
 
208 208
             foreach ($iterator as $file) {
209 209
                 $sourceFile = $file[0];
210 210
 
211
-                if (! preg_match('(^phar:)i', $sourceFile)) {
211
+                if (!preg_match('(^phar:)i', $sourceFile)) {
212 212
                     $sourceFile = realpath($sourceFile);
213 213
                 }
214 214
 
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
         foreach ($declared as $className) {
236 236
             $rc         = new ReflectionClass($className);
237 237
             $sourceFile = $rc->getFileName();
238
-            if (! in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
238
+            if (!in_array($sourceFile, $includedFiles) || $this->isTransient($className)) {
239 239
                 continue;
240 240
             }
241 241
 
Please login to merge, or discard this patch.
lib/Doctrine/Persistence/Mapping/MappingException.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,18 +26,18 @@
 block discarded – undo
26 26
 
27 27
     public static function pathRequired() : self
28 28
     {
29
-        return new self('Specifying the paths to your entities is required ' .
29
+        return new self('Specifying the paths to your entities is required '.
30 30
             'in the AnnotationDriver to retrieve all class names.');
31 31
     }
32 32
 
33 33
     public static function fileMappingDriversRequireConfiguredDirectoryPath(?string $path = null) : self
34 34
     {
35
-        if (! empty($path)) {
36
-            $path = '[' . $path . ']';
35
+        if (!empty($path)) {
36
+            $path = '['.$path.']';
37 37
         }
38 38
 
39 39
         return new self(sprintf(
40
-            'File mapping drivers must have a valid directory path, ' .
40
+            'File mapping drivers must have a valid directory path, '.
41 41
             'however the given path %s seems to be incorrect!',
42 42
             $path
43 43
         ));
Please login to merge, or discard this patch.
lib/Doctrine/Persistence/Event/PreUpdateEventArgs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
      */
90 90
     private function assertValidField(string $field) : void
91 91
     {
92
-        if (! isset($this->entityChangeSet[$field])) {
92
+        if (!isset($this->entityChangeSet[$field])) {
93 93
             throw new InvalidArgumentException(sprintf(
94 94
                 'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
95 95
                 $field,
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Persistence/Mapping/ClassMetadataFactoryTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     public function testGetMetadataForAbsentClass()
46 46
     {
47 47
         $this->expectException(MappingException::class);
48
-        $this->cmf->getMetadataFor(__NAMESPACE__ . '\AbsentClass');
48
+        $this->cmf->getMetadataFor(__NAMESPACE__.'\AbsentClass');
49 49
     }
50 50
 
51 51
     public function testGetParentMetadata()
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     {
62 62
         $metadata = $this->createMock(ClassMetadata::class);
63 63
         $cache    = new ArrayCache();
64
-        $cache->save(ChildEntity::class . '$CLASSMETADATA', $metadata);
64
+        $cache->save(ChildEntity::class.'$CLASSMETADATA', $metadata);
65 65
 
66 66
         $this->cmf->setCacheDriver($cache);
67 67
 
@@ -75,14 +75,14 @@  discard block
 block discarded – undo
75 75
 
76 76
         $loadedMetadata = $this->cmf->getMetadataFor(ChildEntity::class);
77 77
 
78
-        self::assertSame($loadedMetadata, $cache->fetch(ChildEntity::class . '$CLASSMETADATA'));
78
+        self::assertSame($loadedMetadata, $cache->fetch(ChildEntity::class.'$CLASSMETADATA'));
79 79
     }
80 80
 
81 81
     public function testGetAliasedMetadata()
82 82
     {
83 83
         $this->cmf->getMetadataFor('prefix:ChildEntity');
84 84
 
85
-        self::assertTrue($this->cmf->hasMetadataFor(__NAMESPACE__ . '\ChildEntity'));
85
+        self::assertTrue($this->cmf->hasMetadataFor(__NAMESPACE__.'\ChildEntity'));
86 86
         self::assertTrue($this->cmf->hasMetadataFor('prefix:ChildEntity'));
87 87
     }
88 88
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     {
112 112
         $classMetadata = $this->createMock(ClassMetadata::class);
113 113
 
114
-        $this->cmf->fallbackCallback = static function () use ($classMetadata) {
114
+        $this->cmf->fallbackCallback = static function() use ($classMetadata) {
115 115
             return $classMetadata;
116 116
         };
117 117
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
     public function testWillFailOnFallbackFailureWithNotLoadedMetadata()
124 124
     {
125
-        $this->cmf->fallbackCallback = static function () {
125
+        $this->cmf->fallbackCallback = static function() {
126 126
             return null;
127 127
         };
128 128
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Persistence/Mapping/SymfonyFileLocatorTest.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 {
15 15
     public function testGetPaths()
16 16
     {
17
-        $path   = __DIR__ . '/_files';
17
+        $path   = __DIR__.'/_files';
18 18
         $prefix = 'Foo';
19 19
 
20 20
         $locator = new SymfonyFileLocator([$path => $prefix]);
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
     public function testGetPrefixes()
28 28
     {
29
-        $path   = __DIR__ . '/_files';
29
+        $path   = __DIR__.'/_files';
30 30
         $prefix = 'Foo';
31 31
 
32 32
         $locator = new SymfonyFileLocator([$path => $prefix]);
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
     public function testFileExists()
45 45
     {
46
-        $path   = __DIR__ . '/_files';
46
+        $path   = __DIR__.'/_files';
47 47
         $prefix = 'Foo';
48 48
 
49 49
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
     public function testGetAllClassNames()
58 58
     {
59
-        $path   = __DIR__ . '/_files';
59
+        $path   = __DIR__.'/_files';
60 60
         $prefix = 'Foo';
61 61
 
62 62
         $locator       = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
     public function testInvalidCustomNamespaceSeparator()
79 79
     {
80
-        $path   = __DIR__ . '/_files';
80
+        $path   = __DIR__.'/_files';
81 81
         $prefix = 'Foo';
82 82
 
83 83
         $this->expectException(InvalidArgumentException::class);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     public function testGetClassNamesWithCustomNsSeparator($separator, $dir)
106 106
     {
107
-        $path   = __DIR__ . $dir;
107
+        $path   = __DIR__.$dir;
108 108
         $prefix = 'Foo';
109 109
 
110 110
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml', $separator);
@@ -149,29 +149,29 @@  discard block
 block discarded – undo
149 149
      */
150 150
     public function testFindMappingFileWithCustomNsSeparator($separator, $dir, $files)
151 151
     {
152
-        $path   = __DIR__ . $dir;
152
+        $path   = __DIR__.$dir;
153 153
         $prefix = 'Foo';
154 154
 
155 155
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml', $separator);
156 156
 
157 157
         foreach ($files as $filePath => $className) {
158
-            self::assertSame(realpath($path . '/' . $filePath), realpath($locator->findMappingFile($className)));
158
+            self::assertSame(realpath($path.'/'.$filePath), realpath($locator->findMappingFile($className)));
159 159
         }
160 160
     }
161 161
 
162 162
     public function testFindMappingFile()
163 163
     {
164
-        $path   = __DIR__ . '/_files';
164
+        $path   = __DIR__.'/_files';
165 165
         $prefix = 'Foo';
166 166
 
167 167
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
168 168
 
169
-        self::assertSame(__DIR__ . '/_files/stdClass.yml', $locator->findMappingFile('Foo\\stdClass'));
169
+        self::assertSame(__DIR__.'/_files/stdClass.yml', $locator->findMappingFile('Foo\\stdClass'));
170 170
     }
171 171
 
172 172
     public function testFindMappingFileNotFound()
173 173
     {
174
-        $path   = __DIR__ . '/_files';
174
+        $path   = __DIR__.'/_files';
175 175
         $prefix = 'Foo';
176 176
 
177 177
         $locator = new SymfonyFileLocator([$path => $prefix], '.yml');
@@ -185,13 +185,13 @@  discard block
 block discarded – undo
185 185
     {
186 186
         // Low -> High
187 187
         $prefixes                             = [];
188
-        $prefixes[__DIR__ . '/_match_ns']     = 'Foo';
189
-        $prefixes[__DIR__ . '/_match_ns/Bar'] = 'Foo\\Bar';
188
+        $prefixes[__DIR__.'/_match_ns']     = 'Foo';
189
+        $prefixes[__DIR__.'/_match_ns/Bar'] = 'Foo\\Bar';
190 190
 
191 191
         $locator = new SymfonyFileLocator($prefixes, '.yml');
192 192
 
193 193
         self::assertSame(
194
-            __DIR__ . '/_match_ns/Bar/barEntity.yml',
194
+            __DIR__.'/_match_ns/Bar/barEntity.yml',
195 195
             $locator->findMappingFile("Foo\\Bar\\barEntity")
196 196
         );
197 197
     }
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
     public function testFindMappingFileMostSpecificNamespaceFirst()
200 200
     {
201 201
         $prefixes                             = [];
202
-        $prefixes[__DIR__ . '/_match_ns/Bar'] = 'Foo\\Bar';
203
-        $prefixes[__DIR__ . '/_match_ns']     = 'Foo';
202
+        $prefixes[__DIR__.'/_match_ns/Bar'] = 'Foo\\Bar';
203
+        $prefixes[__DIR__.'/_match_ns']     = 'Foo';
204 204
 
205 205
         $locator = new SymfonyFileLocator($prefixes, '.yml');
206 206
 
207 207
         self::assertSame(
208
-            __DIR__ . '/_match_ns/Bar/barEntity.yml',
208
+            __DIR__.'/_match_ns/Bar/barEntity.yml',
209 209
             $locator->findMappingFile("Foo\\Bar\\barEntity")
210 210
         );
211 211
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Persistence/ManagerRegistryTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 
167 167
     private function getManagerFactory()
168 168
     {
169
-        return function (string $name) {
169
+        return function(string $name) {
170 170
             $mock = $this->createMock(ObjectManager::class);
171 171
 
172 172
             $driver   = $this->createMock(MappingDriver::class);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
     protected function getService(string $name) : object
214 214
     {
215
-        if (! isset($this->services[$name])) {
215
+        if (!isset($this->services[$name])) {
216 216
             $this->services[$name] = call_user_func($this->managerFactory, $name);
217 217
         }
218 218
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Persistence/Mapping/TestClassMetadataFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
     protected function getFqcnFromAlias(string $namespaceAlias, string $simpleClassName) : string
37 37
     {
38
-        return __NAMESPACE__ . '\\' . $simpleClassName;
38
+        return __NAMESPACE__.'\\'.$simpleClassName;
39 39
     }
40 40
 
41 41
     protected function initialize() : void
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
     protected function onNotFoundMetadata(string $className) : ?ClassMetadata
69 69
     {
70
-        if (! $this->fallbackCallback) {
70
+        if (!$this->fallbackCallback) {
71 71
             return null;
72 72
         }
73 73
 
Please login to merge, or discard this patch.
lib/Doctrine/Persistence/Mapping/Driver/SymfonyFileLocator.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
      */
128 128
     public function fileExists(string $className) : bool
129 129
     {
130
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className) . $this->fileExtension;
130
+        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
131 131
 
132 132
         foreach ($this->paths as $path) {
133
-            if (! isset($this->prefixes[$path])) {
133
+            if (!isset($this->prefixes[$path])) {
134 134
                 // global namespace class
135
-                if (is_file($path . DIRECTORY_SEPARATOR . $defaultFileName)) {
135
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
136 136
                     return true;
137 137
                 }
138 138
 
@@ -141,11 +141,11 @@  discard block
 block discarded – undo
141 141
 
142 142
             $prefix = $this->prefixes[$path];
143 143
 
144
-            if (strpos($className, $prefix . '\\') !== 0) {
144
+            if (strpos($className, $prefix.'\\') !== 0) {
145 145
                 continue;
146 146
             }
147 147
 
148
-            $filename = $path . '/' . strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator) . $this->fileExtension;
148
+            $filename = $path.'/'.strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator).$this->fileExtension;
149 149
 
150 150
             if (is_file($filename)) {
151 151
                 return true;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
         if ($this->paths) {
166 166
             foreach ((array) $this->paths as $path) {
167
-                if (! is_dir($path)) {
167
+                if (!is_dir($path)) {
168 168
                     throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
169 169
                 }
170 170
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
                             '\\'
190 190
                         );
191 191
 
192
-                        $classes[] = $this->prefixes[$path] . str_replace(DIRECTORY_SEPARATOR, '\\', $nsSuffix) . '\\' . str_replace($this->nsSeparator, '\\', $fileName);
192
+                        $classes[] = $this->prefixes[$path].str_replace(DIRECTORY_SEPARATOR, '\\', $nsSuffix).'\\'.str_replace($this->nsSeparator, '\\', $fileName);
193 193
                     } else {
194 194
                         /** @var string $className */
195 195
                         $className = str_replace($this->nsSeparator, '\\', $fileName);
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
      */
209 209
     public function findMappingFile(string $className) : string
210 210
     {
211
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className) . $this->fileExtension;
211
+        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
212 212
         foreach ($this->paths as $path) {
213
-            if (! isset($this->prefixes[$path])) {
214
-                if (is_file($path . DIRECTORY_SEPARATOR . $defaultFileName)) {
215
-                    return $path . DIRECTORY_SEPARATOR . $defaultFileName;
213
+            if (!isset($this->prefixes[$path])) {
214
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
215
+                    return $path.DIRECTORY_SEPARATOR.$defaultFileName;
216 216
                 }
217 217
 
218 218
                 continue;
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
 
221 221
             $prefix = $this->prefixes[$path];
222 222
 
223
-            if (strpos($className, $prefix . '\\') !== 0) {
223
+            if (strpos($className, $prefix.'\\') !== 0) {
224 224
                 continue;
225 225
             }
226 226
 
227
-            $filename = $path . '/' . strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator) . $this->fileExtension;
227
+            $filename = $path.'/'.strtr(substr($className, strlen($prefix) + 1), '\\', $this->nsSeparator).$this->fileExtension;
228 228
             if (is_file($filename)) {
229 229
                 return $filename;
230 230
             }
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 
233 233
         throw MappingException::mappingFileNotFound(
234 234
             $className,
235
-            substr($className, strrpos($className, '\\') + 1) . $this->fileExtension
235
+            substr($className, strrpos($className, '\\') + 1).$this->fileExtension
236 236
         );
237 237
     }
238 238
 
Please login to merge, or discard this patch.