@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | /** @var array<string, ComposerPackage> */ |
29 | 29 | protected array $changedFiles = array(); |
30 | 30 | |
31 | - public function __construct(StraussConfig $config, string $workingDir) |
|
31 | + public function __construct( StraussConfig $config, string $workingDir ) |
|
32 | 32 | { |
33 | - $this->filesystem = new Filesystem(new Local($workingDir)); |
|
33 | + $this->filesystem = new Filesystem( new Local( $workingDir ) ); |
|
34 | 34 | |
35 | 35 | $this->targetDirectory = $config->getTargetDirectory(); |
36 | 36 | $this->namespacePrefix = $config->getNamespacePrefix(); |
@@ -51,52 +51,52 @@ discard block |
||
51 | 51 | * @param array<string, ComposerPackage> $phpFileList |
52 | 52 | * @throws FileNotFoundException |
53 | 53 | */ |
54 | - public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList) |
|
54 | + public function replaceInFiles( array $namespaceChanges, array $classChanges, array $phpFileList ) |
|
55 | 55 | { |
56 | 56 | |
57 | - foreach ($phpFileList as $sourceRelativeFilePathFromVendor => $package) { |
|
57 | + foreach ( $phpFileList as $sourceRelativeFilePathFromVendor => $package ) { |
|
58 | 58 | // Skip excluded namespaces. |
59 | - if (in_array($package->getName(), $this->excludePackageNamesFromPrefixing)) { |
|
59 | + if ( in_array( $package->getName(), $this->excludePackageNamesFromPrefixing ) ) { |
|
60 | 60 | continue; |
61 | 61 | } |
62 | 62 | |
63 | 63 | // Skip files whose filepath matches an excluded pattern. |
64 | - foreach ($this->excludeFilePatternsFromPrefixing as $excludePattern) { |
|
65 | - if (1 === preg_match($excludePattern, $sourceRelativeFilePathFromVendor)) { |
|
64 | + foreach ( $this->excludeFilePatternsFromPrefixing as $excludePattern ) { |
|
65 | + if ( 1 === preg_match( $excludePattern, $sourceRelativeFilePathFromVendor ) ) { |
|
66 | 66 | continue 2; |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | 70 | $targetRelativeFilepathFromProject = |
71 | - $this->targetDirectory. $sourceRelativeFilePathFromVendor; |
|
71 | + $this->targetDirectory . $sourceRelativeFilePathFromVendor; |
|
72 | 72 | |
73 | 73 | // Throws an exception, but unlikely to happen. |
74 | - $contents = $this->filesystem->read($targetRelativeFilepathFromProject); |
|
74 | + $contents = $this->filesystem->read( $targetRelativeFilepathFromProject ); |
|
75 | 75 | |
76 | - $updatedContents = $this->replaceInString($namespaceChanges, $classChanges, $contents); |
|
76 | + $updatedContents = $this->replaceInString( $namespaceChanges, $classChanges, $contents ); |
|
77 | 77 | |
78 | - if ($updatedContents !== $contents) { |
|
79 | - $this->changedFiles[$sourceRelativeFilePathFromVendor] = $package; |
|
80 | - $this->filesystem->put($targetRelativeFilepathFromProject, $updatedContents); |
|
78 | + if ( $updatedContents !== $contents ) { |
|
79 | + $this->changedFiles[ $sourceRelativeFilePathFromVendor ] = $package; |
|
80 | + $this->filesystem->put( $targetRelativeFilepathFromProject, $updatedContents ); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
85 | - public function replaceInString(array $namespacesChanges, array $classes, string $contents): string |
|
85 | + public function replaceInString( array $namespacesChanges, array $classes, string $contents ): string |
|
86 | 86 | { |
87 | 87 | |
88 | - foreach ($namespacesChanges as $originalNamespace => $replacement) { |
|
89 | - if (in_array($originalNamespace, $this->excludeNamespacesFromPrefixing)) { |
|
88 | + foreach ( $namespacesChanges as $originalNamespace => $replacement ) { |
|
89 | + if ( in_array( $originalNamespace, $this->excludeNamespacesFromPrefixing ) ) { |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
93 | - $contents = $this->replaceNamespace($contents, $originalNamespace, $replacement); |
|
93 | + $contents = $this->replaceNamespace( $contents, $originalNamespace, $replacement ); |
|
94 | 94 | } |
95 | 95 | |
96 | - foreach ($classes as $originalClassname) { |
|
96 | + foreach ( $classes as $originalClassname ) { |
|
97 | 97 | $classmapPrefix = $this->classmapPrefix; |
98 | 98 | |
99 | - $contents = $this->replaceClassname($contents, $originalClassname, $classmapPrefix); |
|
99 | + $contents = $this->replaceClassname( $contents, $originalClassname, $classmapPrefix ); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | return $contents; |
@@ -109,18 +109,18 @@ discard block |
||
109 | 109 | * |
110 | 110 | * @return string The updated text. |
111 | 111 | */ |
112 | - public function replaceNamespace($contents, $originalNamespace, $replacement) |
|
112 | + public function replaceNamespace( $contents, $originalNamespace, $replacement ) |
|
113 | 113 | { |
114 | 114 | |
115 | 115 | // When namespaces exist inside strings... |
116 | 116 | $searchNamespace = |
117 | - preg_quote($originalNamespace, '/') |
|
117 | + preg_quote( $originalNamespace, '/' ) |
|
118 | 118 | . '|' |
119 | - . preg_quote(str_replace('\\', '\\\\', $originalNamespace), '/') |
|
119 | + . preg_quote( str_replace( '\\', '\\\\', $originalNamespace ), '/' ) |
|
120 | 120 | . '|' |
121 | - . preg_quote('\\' . $originalNamespace, '/') |
|
121 | + . preg_quote( '\\' . $originalNamespace, '/' ) |
|
122 | 122 | . '|' |
123 | - . preg_quote('\\\\' . str_replace('\\', '\\\\', $originalNamespace), '/'); |
|
123 | + . preg_quote( '\\\\' . str_replace( '\\', '\\\\', $originalNamespace ), '/' ); |
|
124 | 124 | |
125 | 125 | $pattern = " |
126 | 126 | / # Start the pattern |
@@ -154,39 +154,39 @@ discard block |
||
154 | 154 | |' # or single quote |
155 | 155 | |: # or a colon to access a static |
156 | 156 | ) |
157 | - /Ux"; // U: Non-greedy matching, x: ignore whitespace in pattern. |
|
157 | + /Ux"; // U: Non-greedy matching, x: ignore whitespace in pattern. |
|
158 | 158 | |
159 | - $replacingFunction = function ($matches) use ($originalNamespace, $replacement) { |
|
159 | + $replacingFunction = function( $matches ) use ( $originalNamespace, $replacement ) { |
|
160 | 160 | |
161 | 161 | $singleBackslash = '\\\\'; |
162 | 162 | $doubleBackslash = '\\\\\\\\'; |
163 | - $originalNamespacePattern = str_replace('\\', '\\\\+', $originalNamespace); |
|
163 | + $originalNamespacePattern = str_replace( '\\', '\\\\+', $originalNamespace ); |
|
164 | 164 | $beginsSingleBackslashPattern = "#{$singleBackslash}{$originalNamespacePattern}#"; |
165 | 165 | $beginsDoubleBackslashPattern = "#{$doubleBackslash}{$originalNamespacePattern}#"; |
166 | 166 | $containsDoubleBackslashPattern = "#{$doubleBackslash}#"; |
167 | 167 | |
168 | 168 | // Namespace begins with \\. |
169 | - if (preg_match($beginsDoubleBackslashPattern, $matches[2])) { |
|
170 | - $replacement = str_replace("\\", "\\\\", $replacement); |
|
169 | + if ( preg_match( $beginsDoubleBackslashPattern, $matches[ 2 ] ) ) { |
|
170 | + $replacement = str_replace( "\\", "\\\\", $replacement ); |
|
171 | 171 | $replacement = "\\\\" . $replacement; |
172 | - } elseif (preg_match($beginsSingleBackslashPattern, $matches[2])) { |
|
172 | + } elseif ( preg_match( $beginsSingleBackslashPattern, $matches[ 2 ] ) ) { |
|
173 | 173 | $replacement = "\\" . $replacement; |
174 | - } elseif (preg_match($containsDoubleBackslashPattern, $matches[2])) { |
|
175 | - $replacement = str_replace("\\", "\\\\", $replacement); |
|
174 | + } elseif ( preg_match( $containsDoubleBackslashPattern, $matches[ 2 ] ) ) { |
|
175 | + $replacement = str_replace( "\\", "\\\\", $replacement ); |
|
176 | 176 | } |
177 | 177 | |
178 | - return $matches[1] . $replacement . $matches[3]; |
|
178 | + return $matches[ 1 ] . $replacement . $matches[ 3 ]; |
|
179 | 179 | }; |
180 | 180 | |
181 | - $result = preg_replace_callback($pattern, $replacingFunction, $contents); |
|
181 | + $result = preg_replace_callback( $pattern, $replacingFunction, $contents ); |
|
182 | 182 | |
183 | 183 | $matchingError = preg_last_error(); |
184 | - if (0 !== $matchingError) { |
|
184 | + if ( 0 !== $matchingError ) { |
|
185 | 185 | $message = "Matching error {$matchingError}"; |
186 | - if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) { |
|
186 | + if ( PREG_BACKTRACK_LIMIT_ERROR === $matchingError ) { |
|
187 | 187 | $message = 'Preg Backtrack limit was exhausted!'; |
188 | 188 | } |
189 | - throw new Exception($message); |
|
189 | + throw new Exception( $message ); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | return $result; |
@@ -206,9 +206,9 @@ discard block |
||
206 | 206 | * @return array|string|string[]|null |
207 | 207 | * @throws \Exception |
208 | 208 | */ |
209 | - public function replaceClassname($contents, $originalClassname, $classnamePrefix) |
|
209 | + public function replaceClassname( $contents, $originalClassname, $classnamePrefix ) |
|
210 | 210 | { |
211 | - $searchClassname = preg_quote($originalClassname, '/'); |
|
211 | + $searchClassname = preg_quote( $originalClassname, '/' ); |
|
212 | 212 | |
213 | 213 | // This could be more specific if we could enumerate all preceeding and proceeding words ("new", "("...). |
214 | 214 | $pattern = ' |
@@ -222,12 +222,12 @@ discard block |
||
222 | 222 | |
223 | 223 | /x'; // # x: ignore whitespace in regex. |
224 | 224 | |
225 | - $replacingFunction = function ($matches) use ($originalClassname, $classnamePrefix) { |
|
225 | + $replacingFunction = function( $matches ) use ( $originalClassname, $classnamePrefix ) { |
|
226 | 226 | |
227 | 227 | // If we're inside a namespace other than the global namespace: |
228 | - if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) { |
|
228 | + if ( 1 === preg_match( '/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[ 0 ] ) ) { |
|
229 | 229 | $updated = $this->replaceGlobalClassInsideNamedNamespace( |
230 | - $matches[0], |
|
230 | + $matches[ 0 ], |
|
231 | 231 | $originalClassname, |
232 | 232 | $classnamePrefix |
233 | 233 | ); |
@@ -235,18 +235,18 @@ discard block |
||
235 | 235 | return $updated; |
236 | 236 | } |
237 | 237 | |
238 | - return $matches[1] . $matches[2] . $matches[3] . $classnamePrefix . $originalClassname . $matches[5]; |
|
238 | + return $matches[ 1 ] . $matches[ 2 ] . $matches[ 3 ] . $classnamePrefix . $originalClassname . $matches[ 5 ]; |
|
239 | 239 | }; |
240 | 240 | |
241 | - $result = preg_replace_callback($pattern, $replacingFunction, $contents); |
|
241 | + $result = preg_replace_callback( $pattern, $replacingFunction, $contents ); |
|
242 | 242 | |
243 | 243 | $matchingError = preg_last_error(); |
244 | - if (0 !== $matchingError) { |
|
244 | + if ( 0 !== $matchingError ) { |
|
245 | 245 | $message = "Matching error {$matchingError}"; |
246 | - if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) { |
|
246 | + if ( PREG_BACKTRACK_LIMIT_ERROR === $matchingError ) { |
|
247 | 247 | $message = 'Backtrack limit was exhausted!'; |
248 | 248 | } |
249 | - throw new Exception($message); |
|
249 | + throw new Exception( $message ); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | return $result; |
@@ -260,17 +260,17 @@ discard block |
||
260 | 260 | * @param string $classnamePrefix |
261 | 261 | * @return string |
262 | 262 | */ |
263 | - protected function replaceGlobalClassInsideNamedNamespace($contents, $originalClassname, $classnamePrefix): string |
|
263 | + protected function replaceGlobalClassInsideNamedNamespace( $contents, $originalClassname, $classnamePrefix ): string |
|
264 | 264 | { |
265 | 265 | |
266 | 266 | return preg_replace_callback( |
267 | 267 | '/([^a-zA-Z0-9_\x7f-\xff] # Not a class character |
268 | 268 | \\\) # Followed by a backslash to indicate global namespace |
269 | - ('.$originalClassname.') # Followed by the classname |
|
269 | + ('.$originalClassname . ') # Followed by the classname |
|
270 | 270 | ([^\\\;]+) # Not a backslash or semicolon which might indicate a namespace |
271 | 271 | /x', // # x: ignore whitespace in regex. |
272 | - function ($matches) use ($originalClassname, $classnamePrefix) { |
|
273 | - return $matches[1] . $classnamePrefix . $originalClassname . $matches[3]; |
|
272 | + function( $matches ) use ( $originalClassname, $classnamePrefix ) { |
|
273 | + return $matches[ 1 ] . $classnamePrefix . $originalClassname . $matches[ 3 ]; |
|
274 | 274 | }, |
275 | 275 | $contents |
276 | 276 | ); |
@@ -27,17 +27,17 @@ discard block |
||
27 | 27 | protected array $namespaceReplacementPatterns = array(); |
28 | 28 | |
29 | 29 | /** @var string[] */ |
30 | - protected array $discoveredNamespaces = []; |
|
30 | + protected array $discoveredNamespaces = [ ]; |
|
31 | 31 | |
32 | 32 | /** @var string[] */ |
33 | - protected array $discoveredClasses = []; |
|
33 | + protected array $discoveredClasses = [ ]; |
|
34 | 34 | |
35 | 35 | |
36 | 36 | /** |
37 | 37 | * ChangeEnumerator constructor. |
38 | 38 | * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config |
39 | 39 | */ |
40 | - public function __construct(StraussConfig $config) |
|
40 | + public function __construct( StraussConfig $config ) |
|
41 | 41 | { |
42 | 42 | $this->namespacePrefix = $config->getNamespacePrefix(); |
43 | 43 | $this->classmapPrefix = $config->getClassmapPrefix(); |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | { |
59 | 59 | $discoveredNamespaceReplacements = $this->discoveredNamespaces; |
60 | 60 | |
61 | - uksort($discoveredNamespaceReplacements, function ($a, $b) { |
|
62 | - return strlen($b) <=> strlen($a); |
|
61 | + uksort( $discoveredNamespaceReplacements, function( $a, $b ) { |
|
62 | + return strlen( $b ) <=> strlen( $a ); |
|
63 | 63 | }); |
64 | 64 | |
65 | 65 | return $discoveredNamespaceReplacements; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function getDiscoveredClasses(): array |
72 | 72 | { |
73 | - return array_keys($this->discoveredClasses); |
|
73 | + return array_keys( $this->discoveredClasses ); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | |
@@ -78,18 +78,18 @@ discard block |
||
78 | 78 | * @param string $dir |
79 | 79 | * @param array<string, ComposerPackage> $relativeFilepaths |
80 | 80 | */ |
81 | - public function findInFiles($dir, $relativeFilepaths) |
|
81 | + public function findInFiles( $dir, $relativeFilepaths ) |
|
82 | 82 | { |
83 | 83 | |
84 | - foreach ($relativeFilepaths as $relativeFilepath => $package) { |
|
85 | - foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) { |
|
86 | - if ($package->getName() === $excludePackagesName) { |
|
84 | + foreach ( $relativeFilepaths as $relativeFilepath => $package ) { |
|
85 | + foreach ( $this->excludePackagesFromPrefixing as $excludePackagesName ) { |
|
86 | + if ( $package->getName() === $excludePackagesName ) { |
|
87 | 87 | continue 2; |
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | - foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) { |
|
92 | - if (1 === preg_match($excludeFilePattern, $relativeFilepath)) { |
|
91 | + foreach ( $this->excludeFilePatternsFromPrefixing as $excludeFilePattern ) { |
|
92 | + if ( 1 === preg_match( $excludeFilePattern, $relativeFilepath ) ) { |
|
93 | 93 | continue 2; |
94 | 94 | } |
95 | 95 | } |
@@ -100,9 +100,9 @@ discard block |
||
100 | 100 | // TODO: use flysystem |
101 | 101 | // $contents = $this->filesystem->read($targetFile); |
102 | 102 | |
103 | - $contents = file_get_contents($filepath); |
|
103 | + $contents = file_get_contents( $filepath ); |
|
104 | 104 | |
105 | - $this->find($contents); |
|
105 | + $this->find( $contents ); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
@@ -114,15 +114,15 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @return string $contents |
116 | 116 | */ |
117 | - public function find(string $contents): string |
|
117 | + public function find( string $contents ): string |
|
118 | 118 | { |
119 | 119 | |
120 | 120 | // If the entire file is under one namespace, all we want is the namespace. |
121 | 121 | $singleNamespacePattern = '/ |
122 | 122 | namespace\s+([0-9A-Za-z_\x7f-\xff\\\\]+)[\s\S]*; # A single namespace in the file.... should return |
123 | 123 | /x'; |
124 | - if (1 === preg_match($singleNamespacePattern, $contents, $matches)) { |
|
125 | - $this->addDiscoveredNamespaceChange($matches[1]); |
|
124 | + if ( 1 === preg_match( $singleNamespacePattern, $contents, $matches ) ) { |
|
125 | + $this->addDiscoveredNamespaceChange( $matches[ 1 ] ); |
|
126 | 126 | return $contents; |
127 | 127 | } |
128 | 128 | |
@@ -152,44 +152,44 @@ discard block |
||
152 | 152 | (?:{|extends|implements|\n|$) # Class declaration can be followed by {, extends, implements |
153 | 153 | # or a new line |
154 | 154 | ~x', // # x: ignore whitespace in regex. |
155 | - function ($matches) { |
|
155 | + function( $matches ) { |
|
156 | 156 | |
157 | 157 | // If we're inside a namespace other than the global namespace: |
158 | - if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) { |
|
159 | - $this->addDiscoveredNamespaceChange($matches[1]); |
|
160 | - return $matches[0]; |
|
158 | + if ( 1 === preg_match( '/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[ 0 ] ) ) { |
|
159 | + $this->addDiscoveredNamespaceChange( $matches[ 1 ] ); |
|
160 | + return $matches[ 0 ]; |
|
161 | 161 | } |
162 | 162 | |
163 | - if (count($matches) < 3) { |
|
164 | - return $matches[0]; |
|
163 | + if ( count( $matches ) < 3 ) { |
|
164 | + return $matches[ 0 ]; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | // TODO: Why is this [2] and not [1] (which seems to be always empty). |
168 | - $this->discoveredClasses[$matches[2]] = $matches[2]; |
|
169 | - return $matches[0]; |
|
168 | + $this->discoveredClasses[ $matches[ 2 ] ] = $matches[ 2 ]; |
|
169 | + return $matches[ 0 ]; |
|
170 | 170 | }, |
171 | 171 | $contents |
172 | 172 | ); |
173 | 173 | } |
174 | 174 | |
175 | - protected function addDiscoveredNamespaceChange(string $namespace) |
|
175 | + protected function addDiscoveredNamespaceChange( string $namespace ) |
|
176 | 176 | { |
177 | 177 | |
178 | - foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) { |
|
179 | - if (0 === strpos($namespace, $excludeNamespace)) { |
|
178 | + foreach ( $this->excludeNamespacesFromPrefixing as $excludeNamespace ) { |
|
179 | + if ( 0 === strpos( $namespace, $excludeNamespace ) ) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | } |
183 | 183 | |
184 | - foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) { |
|
185 | - $prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace); |
|
184 | + foreach ( $this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement ) { |
|
185 | + $prefixed = preg_replace( $namespaceReplacementPattern, $replacement, $namespace ); |
|
186 | 186 | |
187 | - if ($prefixed !== $namespace) { |
|
188 | - $this->discoveredNamespaces[$namespace] = $prefixed; |
|
187 | + if ( $prefixed !== $namespace ) { |
|
188 | + $this->discoveredNamespaces[ $namespace ] = $prefixed; |
|
189 | 189 | return; |
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
193 | - $this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace; |
|
193 | + $this->discoveredNamespaces[ $namespace ] = $this->namespacePrefix . '\\' . $namespace; |
|
194 | 194 | } |
195 | 195 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | */ |
44 | 44 | protected function configure() |
45 | 45 | { |
46 | - $this->setName('compose'); |
|
47 | - $this->setDescription("Copy composer's `require` and prefix their namespace and classnames."); |
|
48 | - $this->setHelp(''); |
|
46 | + $this->setName( 'compose' ); |
|
47 | + $this->setDescription( "Copy composer's `require` and prefix their namespace and classnames." ); |
|
48 | + $this->setHelp( '' ); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * @param OutputInterface $output |
56 | 56 | * @return int |
57 | 57 | */ |
58 | - protected function execute(InputInterface $input, OutputInterface $output): int |
|
58 | + protected function execute( InputInterface $input, OutputInterface $output ): int |
|
59 | 59 | { |
60 | 60 | $workingDir = getcwd() . DIRECTORY_SEPARATOR; |
61 | 61 | $this->workingDir = $workingDir; |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | $this->generateAutoloader(); |
79 | 79 | |
80 | 80 | $this->cleanUp(); |
81 | - } catch (Exception $e) { |
|
82 | - $output->write($e->getMessage()); |
|
81 | + } catch ( Exception $e ) { |
|
82 | + $output->write( $e->getMessage() ); |
|
83 | 83 | return 1; |
84 | 84 | } |
85 | 85 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | protected function loadProjectComposerPackage() |
97 | 97 | { |
98 | 98 | |
99 | - $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json'); |
|
99 | + $this->projectComposerPackage = new ProjectComposerPackage( $this->workingDir . 'composer.json' ); |
|
100 | 100 | |
101 | 101 | $config = $this->projectComposerPackage->getStraussConfig(); |
102 | 102 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | |
107 | 107 | /** @var ComposerPackage[] */ |
108 | - protected array $flatDependencyTree = []; |
|
108 | + protected array $flatDependencyTree = [ ]; |
|
109 | 109 | |
110 | 110 | /** |
111 | 111 | * 2. Built flat list of packages and dependencies. |
@@ -120,23 +120,23 @@ discard block |
||
120 | 120 | $requiredPackageNames = $this->config->getPackages(); |
121 | 121 | |
122 | 122 | // Unset PHP, ext-*. |
123 | - $removePhpExt = function ($element) { |
|
124 | - return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
123 | + $removePhpExt = function( $element ) { |
|
124 | + return ! ( 0 === strpos( $element, 'ext' ) || 'php' === $element ); |
|
125 | 125 | }; |
126 | 126 | |
127 | - $requiredPackageNames = array_filter($requiredPackageNames, $removePhpExt); |
|
127 | + $requiredPackageNames = array_filter( $requiredPackageNames, $removePhpExt ); |
|
128 | 128 | |
129 | - foreach ($requiredPackageNames as $requiredPackageName) { |
|
130 | - $packageDir = $this->workingDir . 'vendor' .DIRECTORY_SEPARATOR |
|
129 | + foreach ( $requiredPackageNames as $requiredPackageName ) { |
|
130 | + $packageDir = $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR |
|
131 | 131 | . $requiredPackageName . DIRECTORY_SEPARATOR; |
132 | 132 | |
133 | - $overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName]) |
|
134 | - ? $this->config->getOverrideAutoload()[$requiredPackageName] |
|
133 | + $overrideAutoload = isset( $this->config->getOverrideAutoload()[ $requiredPackageName ] ) |
|
134 | + ? $this->config->getOverrideAutoload()[ $requiredPackageName ] |
|
135 | 135 | : null; |
136 | 136 | |
137 | - $requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload); |
|
138 | - $this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage; |
|
139 | - $this->getAllDependencies($requiredComposerPackage); |
|
137 | + $requiredComposerPackage = new ComposerPackage( $packageDir, $overrideAutoload ); |
|
138 | + $this->flatDependencyTree[ $requiredComposerPackage->getName() ] = $requiredComposerPackage; |
|
139 | + $this->getAllDependencies( $requiredComposerPackage ); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
@@ -145,24 +145,24 @@ discard block |
||
145 | 145 | * |
146 | 146 | * @param ComposerPackage $requiredDependency |
147 | 147 | */ |
148 | - protected function getAllDependencies(ComposerPackage $requiredDependency): void |
|
148 | + protected function getAllDependencies( ComposerPackage $requiredDependency ): void |
|
149 | 149 | { |
150 | 150 | $excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing(); |
151 | 151 | |
152 | 152 | // Unset PHP, ext-*. |
153 | - $removePhpExt = function ($element) { |
|
154 | - return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
153 | + $removePhpExt = function( $element ) { |
|
154 | + return ! ( 0 === strpos( $element, 'ext' ) || 'php' === $element ); |
|
155 | 155 | }; |
156 | 156 | |
157 | - $required = array_filter($requiredDependency->getRequiresNames(), $removePhpExt); |
|
157 | + $required = array_filter( $requiredDependency->getRequiresNames(), $removePhpExt ); |
|
158 | 158 | |
159 | - foreach ($required as $dependencyName) { |
|
160 | - if (in_array($dependencyName, $excludedPackagesNames)) { |
|
159 | + foreach ( $required as $dependencyName ) { |
|
160 | + if ( in_array( $dependencyName, $excludedPackagesNames ) ) { |
|
161 | 161 | continue; |
162 | 162 | } |
163 | 163 | |
164 | - $overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName]) |
|
165 | - ? $this->config->getOverrideAutoload()[$dependencyName] |
|
164 | + $overrideAutoload = isset( $this->config->getOverrideAutoload()[ $dependencyName ] ) |
|
165 | + ? $this->config->getOverrideAutoload()[ $dependencyName ] |
|
166 | 166 | : null; |
167 | 167 | |
168 | 168 | $dependencyComposerPackage = new ComposerPackage( |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | $overrideAutoload |
172 | 172 | ); |
173 | 173 | |
174 | - $this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage; |
|
175 | - $this->getAllDependencies($dependencyComposerPackage); |
|
174 | + $this->flatDependencyTree[ $dependencyName ] = $dependencyComposerPackage; |
|
175 | + $this->getAllDependencies( $dependencyComposerPackage ); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -209,25 +209,25 @@ discard block |
||
209 | 209 | protected function determineChanges() |
210 | 210 | { |
211 | 211 | |
212 | - $this->changeEnumerator = new ChangeEnumerator($this->config); |
|
212 | + $this->changeEnumerator = new ChangeEnumerator( $this->config ); |
|
213 | 213 | |
214 | 214 | $relativeTargetDir = $this->config->getTargetDirectory(); |
215 | 215 | $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
216 | - $this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles); |
|
216 | + $this->changeEnumerator->findInFiles( $relativeTargetDir, $phpFiles ); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | // 5. Update namespaces and class names. |
220 | 220 | // Replace references to updated namespaces and classnames throughout the dependencies. |
221 | 221 | protected function performReplacements() |
222 | 222 | { |
223 | - $this->replacer = new Prefixer($this->config, $this->workingDir); |
|
223 | + $this->replacer = new Prefixer( $this->config, $this->workingDir ); |
|
224 | 224 | |
225 | 225 | $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements(); |
226 | 226 | $classes = $this->changeEnumerator->getDiscoveredClasses(); |
227 | 227 | |
228 | 228 | $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
229 | 229 | |
230 | - $this->replacer->replaceInFiles($namespaces, $classes, $phpFiles); |
|
230 | + $this->replacer->replaceInFiles( $namespaces, $classes, $phpFiles ); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | protected function addLicenses(): void |
@@ -237,12 +237,12 @@ discard block |
||
237 | 237 | |
238 | 238 | $dependencies = $this->flatDependencyTree; |
239 | 239 | |
240 | - $licenser = new Licenser($this->config, $this->workingDir, $dependencies, $author); |
|
240 | + $licenser = new Licenser( $this->config, $this->workingDir, $dependencies, $author ); |
|
241 | 241 | |
242 | 242 | $licenser->copyLicenses(); |
243 | 243 | |
244 | 244 | $modifiedFiles = $this->replacer->getModifiedFiles(); |
245 | - $licenser->addInformationToUpdatedFiles($modifiedFiles); |
|
245 | + $licenser->addInformationToUpdatedFiles( $modifiedFiles ); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | |
254 | 254 | $files = $this->fileEnumerator->getFilesAutoloaders(); |
255 | 255 | |
256 | - $classmap = new Autoload($this->config, $this->workingDir, $files); |
|
256 | + $classmap = new Autoload( $this->config, $this->workingDir, $files ); |
|
257 | 257 | |
258 | 258 | $classmap->generate(); |
259 | 259 | } |
@@ -267,11 +267,11 @@ discard block |
||
267 | 267 | protected function cleanUp() |
268 | 268 | { |
269 | 269 | |
270 | - $cleanup = new Cleanup($this->config, $this->workingDir); |
|
270 | + $cleanup = new Cleanup( $this->config, $this->workingDir ); |
|
271 | 271 | |
272 | - $sourceFiles = array_keys($this->fileEnumerator->getAllFilesAndDependencyList()); |
|
272 | + $sourceFiles = array_keys( $this->fileEnumerator->getAllFilesAndDependencyList() ); |
|
273 | 273 | |
274 | 274 | // This will check the config to check should it delete or not. |
275 | - $cleanup->cleanup($sourceFiles); |
|
275 | + $cleanup->cleanup( $sourceFiles ); |
|
276 | 276 | } |
277 | 277 | } |
@@ -10,13 +10,13 @@ |
||
10 | 10 | /** |
11 | 11 | * @param string $version |
12 | 12 | */ |
13 | - public function __construct(string $version) |
|
13 | + public function __construct( string $version ) |
|
14 | 14 | { |
15 | - parent::__construct('strauss', $version); |
|
15 | + parent::__construct( 'strauss', $version ); |
|
16 | 16 | |
17 | 17 | $composeCommand = new Compose(); |
18 | - $this->add($composeCommand); |
|
18 | + $this->add( $composeCommand ); |
|
19 | 19 | |
20 | - $this->setDefaultCommand('compose'); |
|
20 | + $this->setDefaultCommand( 'compose' ); |
|
21 | 21 | } |
22 | 22 | } |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | * SOFTWARE. |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
|
30 | - define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
29 | +if ( ! defined( 'RANDOM_COMPAT_READ_BUFFER' ) ) { |
|
30 | + define( 'RANDOM_COMPAT_READ_BUFFER', 8 ); |
|
31 | 31 | } |
32 | 32 | |
33 | -if (!is_callable('random_bytes')) { |
|
33 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
34 | 34 | /** |
35 | 35 | * Unless open_basedir is enabled, use /dev/urandom for |
36 | 36 | * random numbers in accordance with best practices |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * |
46 | 46 | * @return string |
47 | 47 | */ |
48 | - function random_bytes($bytes) |
|
48 | + function random_bytes( $bytes ) |
|
49 | 49 | { |
50 | 50 | /** @var resource $fp */ |
51 | 51 | static $fp = null; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * This block should only be run once |
55 | 55 | */ |
56 | - if (empty($fp)) { |
|
56 | + if ( empty( $fp ) ) { |
|
57 | 57 | /** |
58 | 58 | * We don't want to ever read C:\dev\random, only /dev/urandom on |
59 | 59 | * Unix-like operating systems. While we guard against this |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | * like operating system (which means the directory separator is set |
65 | 65 | * to "/" not "\". |
66 | 66 | */ |
67 | - if (DIRECTORY_SEPARATOR === '/') { |
|
68 | - if (!is_readable('/dev/urandom')) { |
|
67 | + if ( DIRECTORY_SEPARATOR === '/' ) { |
|
68 | + if ( ! is_readable( '/dev/urandom' ) ) { |
|
69 | 69 | throw new Exception( |
70 | 70 | 'Environment misconfiguration: ' . |
71 | 71 | '/dev/urandom cannot be read.' |
@@ -76,18 +76,18 @@ discard block |
||
76 | 76 | * We never fall back to /dev/random |
77 | 77 | */ |
78 | 78 | /** @var resource|bool $fp */ |
79 | - $fp = fopen('/dev/urandom', 'rb'); |
|
80 | - if (is_resource($fp)) { |
|
79 | + $fp = fopen( '/dev/urandom', 'rb' ); |
|
80 | + if ( is_resource( $fp ) ) { |
|
81 | 81 | /** @var array<string, int> $st */ |
82 | - $st = fstat($fp); |
|
83 | - if (($st['mode'] & 0170000) !== 020000) { |
|
84 | - fclose($fp); |
|
82 | + $st = fstat( $fp ); |
|
83 | + if ( ( $st[ 'mode' ] & 0170000 ) !== 020000 ) { |
|
84 | + fclose( $fp ); |
|
85 | 85 | $fp = false; |
86 | 86 | } |
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | - if (is_resource($fp)) { |
|
90 | + if ( is_resource( $fp ) ) { |
|
91 | 91 | /** |
92 | 92 | * stream_set_read_buffer() does not exist in HHVM |
93 | 93 | * |
@@ -96,25 +96,25 @@ discard block |
||
96 | 96 | * |
97 | 97 | * stream_set_read_buffer returns 0 on success |
98 | 98 | */ |
99 | - if (is_callable('stream_set_read_buffer')) { |
|
100 | - stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); |
|
99 | + if ( is_callable( 'stream_set_read_buffer' ) ) { |
|
100 | + stream_set_read_buffer( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
101 | 101 | } |
102 | - if (is_callable('stream_set_chunk_size')) { |
|
103 | - stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); |
|
102 | + if ( is_callable( 'stream_set_chunk_size' ) ) { |
|
103 | + stream_set_chunk_size( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | 108 | try { |
109 | 109 | /** @var int $bytes */ |
110 | - $bytes = RandomCompat_intval($bytes); |
|
111 | - } catch (TypeError $ex) { |
|
110 | + $bytes = RandomCompat_intval( $bytes ); |
|
111 | + } catch ( TypeError $ex ) { |
|
112 | 112 | throw new TypeError( |
113 | 113 | 'random_bytes(): $bytes must be an integer' |
114 | 114 | ); |
115 | 115 | } |
116 | 116 | |
117 | - if ($bytes < 1) { |
|
117 | + if ( $bytes < 1 ) { |
|
118 | 118 | throw new Error( |
119 | 119 | 'Length must be greater than 0' |
120 | 120 | ); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * if (empty($fp)) line is logic that should only be run once per |
128 | 128 | * page load. |
129 | 129 | */ |
130 | - if (is_resource($fp)) { |
|
130 | + if ( is_resource( $fp ) ) { |
|
131 | 131 | /** |
132 | 132 | * @var int |
133 | 133 | */ |
@@ -145,8 +145,8 @@ discard block |
||
145 | 145 | /** |
146 | 146 | * @var string|bool |
147 | 147 | */ |
148 | - $read = fread($fp, $remaining); |
|
149 | - if (!is_string($read)) { |
|
148 | + $read = fread( $fp, $remaining ); |
|
149 | + if ( ! is_string( $read ) ) { |
|
150 | 150 | /** |
151 | 151 | * We cannot safely read from the file. Exit the |
152 | 152 | * do-while loop and trigger the exception condition |
@@ -159,19 +159,19 @@ discard block |
||
159 | 159 | /** |
160 | 160 | * Decrease the number of bytes returned from remaining |
161 | 161 | */ |
162 | - $remaining -= RandomCompat_strlen($read); |
|
162 | + $remaining -= RandomCompat_strlen( $read ); |
|
163 | 163 | /** |
164 | 164 | * @var string $buf |
165 | 165 | */ |
166 | 166 | $buf .= $read; |
167 | - } while ($remaining > 0); |
|
167 | + } while ( $remaining > 0 ); |
|
168 | 168 | |
169 | 169 | /** |
170 | 170 | * Is our result valid? |
171 | 171 | * @var string|bool $buf |
172 | 172 | */ |
173 | - if (is_string($buf)) { |
|
174 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
173 | + if ( is_string( $buf ) ) { |
|
174 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
175 | 175 | /** |
176 | 176 | * Return our random entropy buffer here: |
177 | 177 | */ |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!is_callable('random_int')) { |
|
3 | +if ( ! is_callable( 'random_int' ) ) { |
|
4 | 4 | /** |
5 | 5 | * Random_* Compatibility Library |
6 | 6 | * for using the new PHP 7 random_* API in PHP 5 projects |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * |
39 | 39 | * @return int |
40 | 40 | */ |
41 | - function random_int($min, $max) |
|
41 | + function random_int( $min, $max ) |
|
42 | 42 | { |
43 | 43 | /** |
44 | 44 | * Type and input logic checks |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | |
53 | 53 | try { |
54 | 54 | /** @var int $min */ |
55 | - $min = RandomCompat_intval($min); |
|
56 | - } catch (TypeError $ex) { |
|
55 | + $min = RandomCompat_intval( $min ); |
|
56 | + } catch ( TypeError $ex ) { |
|
57 | 57 | throw new TypeError( |
58 | 58 | 'random_int(): $min must be an integer' |
59 | 59 | ); |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | |
62 | 62 | try { |
63 | 63 | /** @var int $max */ |
64 | - $max = RandomCompat_intval($max); |
|
65 | - } catch (TypeError $ex) { |
|
64 | + $max = RandomCompat_intval( $max ); |
|
65 | + } catch ( TypeError $ex ) { |
|
66 | 66 | throw new TypeError( |
67 | 67 | 'random_int(): $max must be an integer' |
68 | 68 | ); |
@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | * let's validate the logic then we can move forward with generating random |
74 | 74 | * integers along a given range. |
75 | 75 | */ |
76 | - if ($min > $max) { |
|
76 | + if ( $min > $max ) { |
|
77 | 77 | throw new Error( |
78 | 78 | 'Minimum value must be less than or equal to the maximum value' |
79 | 79 | ); |
80 | 80 | } |
81 | 81 | |
82 | - if ($max === $min) { |
|
83 | - return (int) $min; |
|
82 | + if ( $max === $min ) { |
|
83 | + return (int)$min; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | /** |
111 | 111 | * Test for integer overflow: |
112 | 112 | */ |
113 | - if (!is_int($range)) { |
|
113 | + if ( ! is_int( $range ) ) { |
|
114 | 114 | |
115 | 115 | /** |
116 | 116 | * Still safely calculate wider ranges. |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | * $bits is effectively ceil(log($range, 2)) without dealing with |
134 | 134 | * type juggling |
135 | 135 | */ |
136 | - while ($range > 0) { |
|
137 | - if ($bits % 8 === 0) { |
|
136 | + while ( $range > 0 ) { |
|
137 | + if ( $bits % 8 === 0 ) { |
|
138 | 138 | ++$bytes; |
139 | 139 | } |
140 | 140 | ++$bits; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * The rejection probability is at most 0.5, so this corresponds |
158 | 158 | * to a failure probability of 2^-128 for a working RNG |
159 | 159 | */ |
160 | - if ($attempts > 128) { |
|
160 | + if ( $attempts > 128 ) { |
|
161 | 161 | throw new Exception( |
162 | 162 | 'random_int: RNG is broken - too many rejections' |
163 | 163 | ); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | /** |
167 | 167 | * Let's grab the necessary number of random bytes |
168 | 168 | */ |
169 | - $randomByteString = random_bytes($bytes); |
|
169 | + $randomByteString = random_bytes( $bytes ); |
|
170 | 170 | |
171 | 171 | /** |
172 | 172 | * Let's turn $randomByteString into an integer |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | * 204631455 |
180 | 180 | */ |
181 | 181 | $val &= 0; |
182 | - for ($i = 0; $i < $bytes; ++$i) { |
|
183 | - $val |= ord($randomByteString[$i]) << ($i * 8); |
|
182 | + for ( $i = 0; $i < $bytes; ++$i ) { |
|
183 | + $val |= ord( $randomByteString[ $i ] ) << ( $i * 8 ); |
|
184 | 184 | } |
185 | 185 | /** @var int $val */ |
186 | 186 | |
@@ -197,8 +197,8 @@ discard block |
||
197 | 197 | * ... or smaller than $min, |
198 | 198 | * then try again. |
199 | 199 | */ |
200 | - } while (!is_int($val) || $val > $max || $val < $min); |
|
200 | + } while ( ! is_int( $val ) || $val > $max || $val < $min ); |
|
201 | 201 | |
202 | - return (int) $val; |
|
202 | + return (int)$val; |
|
203 | 203 | } |
204 | 204 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * SOFTWARE. |
27 | 27 | */ |
28 | 28 | |
29 | -if (!is_callable('random_bytes')) { |
|
29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
30 | 30 | /** |
31 | 31 | * If the libsodium PHP extension is loaded, we'll use it above any other |
32 | 32 | * solution. |
@@ -40,18 +40,18 @@ discard block |
||
40 | 40 | * |
41 | 41 | * @return string |
42 | 42 | */ |
43 | - function random_bytes($bytes) |
|
43 | + function random_bytes( $bytes ) |
|
44 | 44 | { |
45 | 45 | try { |
46 | 46 | /** @var int $bytes */ |
47 | - $bytes = RandomCompat_intval($bytes); |
|
48 | - } catch (TypeError $ex) { |
|
47 | + $bytes = RandomCompat_intval( $bytes ); |
|
48 | + } catch ( TypeError $ex ) { |
|
49 | 49 | throw new TypeError( |
50 | 50 | 'random_bytes(): $bytes must be an integer' |
51 | 51 | ); |
52 | 52 | } |
53 | 53 | |
54 | - if ($bytes < 1) { |
|
54 | + if ( $bytes < 1 ) { |
|
55 | 55 | throw new Error( |
56 | 56 | 'Length must be greater than 0' |
57 | 57 | ); |
@@ -66,19 +66,19 @@ discard block |
||
66 | 66 | * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
67 | 67 | * generated in one invocation. |
68 | 68 | */ |
69 | - if ($bytes > 2147483647) { |
|
70 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
71 | - $n = ($bytes - $i) > 1073741824 |
|
69 | + if ( $bytes > 2147483647 ) { |
|
70 | + for ( $i = 0; $i < $bytes; $i += 1073741824 ) { |
|
71 | + $n = ( $bytes - $i ) > 1073741824 |
|
72 | 72 | ? 1073741824 |
73 | 73 | : $bytes - $i; |
74 | - $buf .= Sodium::randombytes_buf((int) $n); |
|
74 | + $buf .= Sodium::randombytes_buf( (int)$n ); |
|
75 | 75 | } |
76 | 76 | } else { |
77 | - $buf .= Sodium::randombytes_buf((int) $bytes); |
|
77 | + $buf .= Sodium::randombytes_buf( (int)$bytes ); |
|
78 | 78 | } |
79 | 79 | |
80 | - if (is_string($buf)) { |
|
81 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
80 | + if ( is_string( $buf ) ) { |
|
81 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
82 | 82 | return $buf; |
83 | 83 | } |
84 | 84 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * SOFTWARE. |
27 | 27 | */ |
28 | 28 | |
29 | -if (!is_callable('RandomCompat_intval')) { |
|
29 | +if ( ! is_callable( 'RandomCompat_intval' ) ) { |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * Cast to an integer if we can, safely. |
@@ -45,29 +45,29 @@ discard block |
||
45 | 45 | * |
46 | 46 | * @throws TypeError |
47 | 47 | */ |
48 | - function RandomCompat_intval($number, $fail_open = false) |
|
48 | + function RandomCompat_intval( $number, $fail_open = false ) |
|
49 | 49 | { |
50 | - if (is_int($number) || is_float($number)) { |
|
50 | + if ( is_int( $number ) || is_float( $number ) ) { |
|
51 | 51 | $number += 0; |
52 | - } elseif (is_numeric($number)) { |
|
52 | + } elseif ( is_numeric( $number ) ) { |
|
53 | 53 | /** @psalm-suppress InvalidOperand */ |
54 | 54 | $number += 0; |
55 | 55 | } |
56 | 56 | /** @var int|float $number */ |
57 | 57 | |
58 | 58 | if ( |
59 | - is_float($number) |
|
59 | + is_float( $number ) |
|
60 | 60 | && |
61 | 61 | $number > ~PHP_INT_MAX |
62 | 62 | && |
63 | 63 | $number < PHP_INT_MAX |
64 | 64 | ) { |
65 | - $number = (int) $number; |
|
65 | + $number = (int)$number; |
|
66 | 66 | } |
67 | 67 | |
68 | - if (is_int($number)) { |
|
69 | - return (int) $number; |
|
70 | - } elseif (!$fail_open) { |
|
68 | + if ( is_int( $number ) ) { |
|
69 | + return (int)$number; |
|
70 | + } elseif ( ! $fail_open ) { |
|
71 | 71 | throw new TypeError( |
72 | 72 | 'Expected an integer.' |
73 | 73 | ); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * SOFTWARE. |
27 | 27 | */ |
28 | 28 | |
29 | -if (!is_callable('random_bytes')) { |
|
29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
30 | 30 | /** |
31 | 31 | * Powered by ext/mcrypt (and thankfully NOT libmcrypt) |
32 | 32 | * |
@@ -39,29 +39,29 @@ discard block |
||
39 | 39 | * |
40 | 40 | * @return string |
41 | 41 | */ |
42 | - function random_bytes($bytes) |
|
42 | + function random_bytes( $bytes ) |
|
43 | 43 | { |
44 | 44 | try { |
45 | 45 | /** @var int $bytes */ |
46 | - $bytes = RandomCompat_intval($bytes); |
|
47 | - } catch (TypeError $ex) { |
|
46 | + $bytes = RandomCompat_intval( $bytes ); |
|
47 | + } catch ( TypeError $ex ) { |
|
48 | 48 | throw new TypeError( |
49 | 49 | 'random_bytes(): $bytes must be an integer' |
50 | 50 | ); |
51 | 51 | } |
52 | 52 | |
53 | - if ($bytes < 1) { |
|
53 | + if ( $bytes < 1 ) { |
|
54 | 54 | throw new Error( |
55 | 55 | 'Length must be greater than 0' |
56 | 56 | ); |
57 | 57 | } |
58 | 58 | |
59 | 59 | /** @var string|bool $buf */ |
60 | - $buf = @mcrypt_create_iv((int) $bytes, (int) MCRYPT_DEV_URANDOM); |
|
60 | + $buf = @mcrypt_create_iv( (int)$bytes, (int)MCRYPT_DEV_URANDOM ); |
|
61 | 61 | if ( |
62 | - is_string($buf) |
|
62 | + is_string( $buf ) |
|
63 | 63 | && |
64 | - RandomCompat_strlen($buf) === $bytes |
|
64 | + RandomCompat_strlen( $buf ) === $bytes |
|
65 | 65 | ) { |
66 | 66 | /** |
67 | 67 | * Return our random entropy buffer here: |