@@ -13,128 +13,128 @@ discard block |
||
13 | 13 | class ChangeEnumerator |
14 | 14 | { |
15 | 15 | |
16 | - protected string $namespacePrefix; |
|
17 | - protected string $classmapPrefix; |
|
18 | - /** |
|
19 | - * |
|
20 | - * @var string[] |
|
21 | - */ |
|
22 | - protected array $excludePackagesFromPrefixing = array(); |
|
23 | - protected array $excludeNamespacesFromPrefixing = array(); |
|
24 | - |
|
25 | - protected array $excludeFilePatternsFromPrefixing = array(); |
|
26 | - |
|
27 | - protected array $namespaceReplacementPatterns = array(); |
|
28 | - |
|
29 | - /** @var string[] */ |
|
30 | - protected array $discoveredNamespaces = []; |
|
31 | - |
|
32 | - /** @var string[] */ |
|
33 | - protected array $discoveredClasses = []; |
|
34 | - |
|
35 | - |
|
36 | - /** |
|
37 | - * ChangeEnumerator constructor. |
|
38 | - * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config |
|
39 | - */ |
|
40 | - public function __construct(StraussConfig $config) |
|
41 | - { |
|
42 | - $this->namespacePrefix = $config->getNamespacePrefix(); |
|
43 | - $this->classmapPrefix = $config->getClassmapPrefix(); |
|
44 | - |
|
45 | - $this->excludePackagesFromPrefixing = $config->getExcludePackagesFromPrefixing(); |
|
46 | - $this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing(); |
|
47 | - $this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing(); |
|
48 | - |
|
49 | - $this->namespaceReplacementPatterns = $config->getNamespaceReplacementPatterns(); |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * TODO: Order by longest string first. (or instead, record classnames with their namespaces) |
|
54 | - * |
|
55 | - * @return string[] |
|
56 | - */ |
|
57 | - public function getDiscoveredNamespaceReplacements(): array |
|
58 | - { |
|
59 | - $discoveredNamespaceReplacements = $this->discoveredNamespaces; |
|
60 | - |
|
61 | - uksort($discoveredNamespaceReplacements, function ($a, $b) { |
|
62 | - return strlen($b) <=> strlen($a); |
|
63 | - }); |
|
64 | - |
|
65 | - return $discoveredNamespaceReplacements; |
|
66 | - } |
|
67 | - |
|
68 | - /** |
|
69 | - * @return string[] |
|
70 | - */ |
|
71 | - public function getDiscoveredClasses(): array |
|
72 | - { |
|
73 | - return array_keys($this->discoveredClasses); |
|
74 | - } |
|
75 | - |
|
76 | - |
|
77 | - /** |
|
78 | - * @param string $dir |
|
79 | - * @param array<string, ComposerPackage> $relativeFilepaths |
|
80 | - */ |
|
81 | - public function findInFiles($dir, $relativeFilepaths) |
|
82 | - { |
|
83 | - |
|
84 | - foreach ($relativeFilepaths as $relativeFilepath => $package) { |
|
85 | - foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) { |
|
86 | - if ($package->getName() === $excludePackagesName) { |
|
87 | - continue 2; |
|
88 | - } |
|
89 | - } |
|
90 | - |
|
91 | - foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) { |
|
92 | - if (1 === preg_match($excludeFilePattern, $relativeFilepath)) { |
|
93 | - continue 2; |
|
94 | - } |
|
95 | - } |
|
96 | - |
|
97 | - |
|
98 | - $filepath = $dir . $relativeFilepath; |
|
99 | - |
|
100 | - // TODO: use flysystem |
|
101 | - // $contents = $this->filesystem->read($targetFile); |
|
102 | - |
|
103 | - $contents = file_get_contents($filepath); |
|
104 | - |
|
105 | - $this->find($contents); |
|
106 | - } |
|
107 | - } |
|
108 | - |
|
109 | - |
|
110 | - /** |
|
111 | - * TODO: Don't use preg_replace_callback! |
|
112 | - * |
|
113 | - * @param string $contents |
|
114 | - * |
|
115 | - * @return string $contents |
|
116 | - */ |
|
117 | - public function find(string $contents): string |
|
118 | - { |
|
119 | - |
|
120 | - // If the entire file is under one namespace, all we want is the namespace. |
|
121 | - $singleNamespacePattern = '/ |
|
16 | + protected string $namespacePrefix; |
|
17 | + protected string $classmapPrefix; |
|
18 | + /** |
|
19 | + * |
|
20 | + * @var string[] |
|
21 | + */ |
|
22 | + protected array $excludePackagesFromPrefixing = array(); |
|
23 | + protected array $excludeNamespacesFromPrefixing = array(); |
|
24 | + |
|
25 | + protected array $excludeFilePatternsFromPrefixing = array(); |
|
26 | + |
|
27 | + protected array $namespaceReplacementPatterns = array(); |
|
28 | + |
|
29 | + /** @var string[] */ |
|
30 | + protected array $discoveredNamespaces = []; |
|
31 | + |
|
32 | + /** @var string[] */ |
|
33 | + protected array $discoveredClasses = []; |
|
34 | + |
|
35 | + |
|
36 | + /** |
|
37 | + * ChangeEnumerator constructor. |
|
38 | + * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config |
|
39 | + */ |
|
40 | + public function __construct(StraussConfig $config) |
|
41 | + { |
|
42 | + $this->namespacePrefix = $config->getNamespacePrefix(); |
|
43 | + $this->classmapPrefix = $config->getClassmapPrefix(); |
|
44 | + |
|
45 | + $this->excludePackagesFromPrefixing = $config->getExcludePackagesFromPrefixing(); |
|
46 | + $this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing(); |
|
47 | + $this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing(); |
|
48 | + |
|
49 | + $this->namespaceReplacementPatterns = $config->getNamespaceReplacementPatterns(); |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * TODO: Order by longest string first. (or instead, record classnames with their namespaces) |
|
54 | + * |
|
55 | + * @return string[] |
|
56 | + */ |
|
57 | + public function getDiscoveredNamespaceReplacements(): array |
|
58 | + { |
|
59 | + $discoveredNamespaceReplacements = $this->discoveredNamespaces; |
|
60 | + |
|
61 | + uksort($discoveredNamespaceReplacements, function ($a, $b) { |
|
62 | + return strlen($b) <=> strlen($a); |
|
63 | + }); |
|
64 | + |
|
65 | + return $discoveredNamespaceReplacements; |
|
66 | + } |
|
67 | + |
|
68 | + /** |
|
69 | + * @return string[] |
|
70 | + */ |
|
71 | + public function getDiscoveredClasses(): array |
|
72 | + { |
|
73 | + return array_keys($this->discoveredClasses); |
|
74 | + } |
|
75 | + |
|
76 | + |
|
77 | + /** |
|
78 | + * @param string $dir |
|
79 | + * @param array<string, ComposerPackage> $relativeFilepaths |
|
80 | + */ |
|
81 | + public function findInFiles($dir, $relativeFilepaths) |
|
82 | + { |
|
83 | + |
|
84 | + foreach ($relativeFilepaths as $relativeFilepath => $package) { |
|
85 | + foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) { |
|
86 | + if ($package->getName() === $excludePackagesName) { |
|
87 | + continue 2; |
|
88 | + } |
|
89 | + } |
|
90 | + |
|
91 | + foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) { |
|
92 | + if (1 === preg_match($excludeFilePattern, $relativeFilepath)) { |
|
93 | + continue 2; |
|
94 | + } |
|
95 | + } |
|
96 | + |
|
97 | + |
|
98 | + $filepath = $dir . $relativeFilepath; |
|
99 | + |
|
100 | + // TODO: use flysystem |
|
101 | + // $contents = $this->filesystem->read($targetFile); |
|
102 | + |
|
103 | + $contents = file_get_contents($filepath); |
|
104 | + |
|
105 | + $this->find($contents); |
|
106 | + } |
|
107 | + } |
|
108 | + |
|
109 | + |
|
110 | + /** |
|
111 | + * TODO: Don't use preg_replace_callback! |
|
112 | + * |
|
113 | + * @param string $contents |
|
114 | + * |
|
115 | + * @return string $contents |
|
116 | + */ |
|
117 | + public function find(string $contents): string |
|
118 | + { |
|
119 | + |
|
120 | + // If the entire file is under one namespace, all we want is the namespace. |
|
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]); |
|
126 | - return $contents; |
|
127 | - } |
|
124 | + if (1 === preg_match($singleNamespacePattern, $contents, $matches)) { |
|
125 | + $this->addDiscoveredNamespaceChange($matches[1]); |
|
126 | + return $contents; |
|
127 | + } |
|
128 | 128 | |
129 | 129 | |
130 | - // TODO traits |
|
130 | + // TODO traits |
|
131 | 131 | |
132 | - // TODO: Is the ";" in this still correct since it's being taken care of in the regex just above? |
|
133 | - // Looks like with the preceeding regex, it will never match. |
|
132 | + // TODO: Is the ";" in this still correct since it's being taken care of in the regex just above? |
|
133 | + // Looks like with the preceeding regex, it will never match. |
|
134 | 134 | |
135 | 135 | |
136 | - return preg_replace_callback( |
|
137 | - ' |
|
136 | + return preg_replace_callback( |
|
137 | + ' |
|
138 | 138 | ~ # Start the pattern |
139 | 139 | namespace\s+([a-zA-Z0-9_\x7f-\xff\\\\]+)[;{\s\n]{1}[\s\S]*?(?=namespace|$) |
140 | 140 | # Look for a preceeding namespace declaration, |
@@ -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) { |
|
156 | - |
|
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]; |
|
161 | - } |
|
162 | - |
|
163 | - if (count($matches) < 3) { |
|
164 | - return $matches[0]; |
|
165 | - } |
|
166 | - |
|
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]; |
|
170 | - }, |
|
171 | - $contents |
|
172 | - ); |
|
173 | - } |
|
174 | - |
|
175 | - protected function addDiscoveredNamespaceChange(string $namespace) |
|
176 | - { |
|
177 | - |
|
178 | - foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) { |
|
179 | - if (0 === strpos($namespace, $excludeNamespace)) { |
|
180 | - return; |
|
181 | - } |
|
182 | - } |
|
183 | - |
|
184 | - foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) { |
|
185 | - $prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace); |
|
186 | - |
|
187 | - if ($prefixed !== $namespace) { |
|
188 | - $this->discoveredNamespaces[$namespace] = $prefixed; |
|
189 | - return; |
|
190 | - } |
|
191 | - } |
|
192 | - |
|
193 | - $this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace; |
|
194 | - } |
|
155 | + function ($matches) { |
|
156 | + |
|
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]; |
|
161 | + } |
|
162 | + |
|
163 | + if (count($matches) < 3) { |
|
164 | + return $matches[0]; |
|
165 | + } |
|
166 | + |
|
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]; |
|
170 | + }, |
|
171 | + $contents |
|
172 | + ); |
|
173 | + } |
|
174 | + |
|
175 | + protected function addDiscoveredNamespaceChange(string $namespace) |
|
176 | + { |
|
177 | + |
|
178 | + foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) { |
|
179 | + if (0 === strpos($namespace, $excludeNamespace)) { |
|
180 | + return; |
|
181 | + } |
|
182 | + } |
|
183 | + |
|
184 | + foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) { |
|
185 | + $prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace); |
|
186 | + |
|
187 | + if ($prefixed !== $namespace) { |
|
188 | + $this->discoveredNamespaces[$namespace] = $prefixed; |
|
189 | + return; |
|
190 | + } |
|
191 | + } |
|
192 | + |
|
193 | + $this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace; |
|
194 | + } |
|
195 | 195 | } |
@@ -19,259 +19,259 @@ |
||
19 | 19 | |
20 | 20 | class Compose extends Command |
21 | 21 | { |
22 | - /** @var string */ |
|
23 | - protected string $workingDir; |
|
22 | + /** @var string */ |
|
23 | + protected string $workingDir; |
|
24 | 24 | |
25 | - /** @var StraussConfig */ |
|
26 | - protected StraussConfig $config; |
|
25 | + /** @var StraussConfig */ |
|
26 | + protected StraussConfig $config; |
|
27 | 27 | |
28 | - protected ProjectComposerPackage $projectComposerPackage; |
|
28 | + protected ProjectComposerPackage $projectComposerPackage; |
|
29 | 29 | |
30 | - /** @var Copier */ |
|
31 | - protected Copier $copier; |
|
30 | + /** @var Copier */ |
|
31 | + protected Copier $copier; |
|
32 | 32 | |
33 | - /** @var Prefixer */ |
|
34 | - protected Prefixer $replacer; |
|
35 | - /** |
|
36 | - * @var ChangeEnumerator |
|
37 | - */ |
|
38 | - protected ChangeEnumerator $changeEnumerator; |
|
33 | + /** @var Prefixer */ |
|
34 | + protected Prefixer $replacer; |
|
35 | + /** |
|
36 | + * @var ChangeEnumerator |
|
37 | + */ |
|
38 | + protected ChangeEnumerator $changeEnumerator; |
|
39 | 39 | |
40 | 40 | |
41 | - /** |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - protected function configure() |
|
45 | - { |
|
46 | - $this->setName('compose'); |
|
47 | - $this->setDescription("Copy composer's `require` and prefix their namespace and classnames."); |
|
48 | - $this->setHelp(''); |
|
49 | - } |
|
41 | + /** |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + protected function configure() |
|
45 | + { |
|
46 | + $this->setName('compose'); |
|
47 | + $this->setDescription("Copy composer's `require` and prefix their namespace and classnames."); |
|
48 | + $this->setHelp(''); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @see Command::execute() |
|
53 | - * |
|
54 | - * @param InputInterface $input |
|
55 | - * @param OutputInterface $output |
|
56 | - * @return int |
|
57 | - */ |
|
58 | - protected function execute(InputInterface $input, OutputInterface $output): int |
|
59 | - { |
|
60 | - $workingDir = getcwd() . DIRECTORY_SEPARATOR; |
|
61 | - $this->workingDir = $workingDir; |
|
51 | + /** |
|
52 | + * @see Command::execute() |
|
53 | + * |
|
54 | + * @param InputInterface $input |
|
55 | + * @param OutputInterface $output |
|
56 | + * @return int |
|
57 | + */ |
|
58 | + protected function execute(InputInterface $input, OutputInterface $output): int |
|
59 | + { |
|
60 | + $workingDir = getcwd() . DIRECTORY_SEPARATOR; |
|
61 | + $this->workingDir = $workingDir; |
|
62 | 62 | |
63 | - try { |
|
64 | - $this->loadProjectComposerPackage(); |
|
63 | + try { |
|
64 | + $this->loadProjectComposerPackage(); |
|
65 | 65 | |
66 | - $this->buildDependencyList(); |
|
66 | + $this->buildDependencyList(); |
|
67 | 67 | |
68 | - $this->enumerateFiles(); |
|
68 | + $this->enumerateFiles(); |
|
69 | 69 | |
70 | - $this->copyFiles(); |
|
70 | + $this->copyFiles(); |
|
71 | 71 | |
72 | - $this->determineChanges(); |
|
72 | + $this->determineChanges(); |
|
73 | 73 | |
74 | - $this->performReplacements(); |
|
74 | + $this->performReplacements(); |
|
75 | 75 | |
76 | - $this->addLicenses(); |
|
77 | - |
|
78 | - $this->generateAutoloader(); |
|
76 | + $this->addLicenses(); |
|
77 | + |
|
78 | + $this->generateAutoloader(); |
|
79 | 79 | |
80 | - $this->cleanUp(); |
|
81 | - } catch (Exception $e) { |
|
82 | - $output->write($e->getMessage()); |
|
83 | - return 1; |
|
84 | - } |
|
80 | + $this->cleanUp(); |
|
81 | + } catch (Exception $e) { |
|
82 | + $output->write($e->getMessage()); |
|
83 | + return 1; |
|
84 | + } |
|
85 | 85 | |
86 | - // What should this be?! |
|
87 | - return 0; |
|
88 | - } |
|
86 | + // What should this be?! |
|
87 | + return 0; |
|
88 | + } |
|
89 | 89 | |
90 | 90 | |
91 | - /** |
|
92 | - * 1. Load the composer.json. |
|
93 | - * |
|
94 | - * @throws Exception |
|
95 | - */ |
|
96 | - protected function loadProjectComposerPackage() |
|
97 | - { |
|
91 | + /** |
|
92 | + * 1. Load the composer.json. |
|
93 | + * |
|
94 | + * @throws Exception |
|
95 | + */ |
|
96 | + protected function loadProjectComposerPackage() |
|
97 | + { |
|
98 | 98 | |
99 | - $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json'); |
|
99 | + $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json'); |
|
100 | 100 | |
101 | - $config = $this->projectComposerPackage->getStraussConfig(); |
|
101 | + $config = $this->projectComposerPackage->getStraussConfig(); |
|
102 | 102 | |
103 | - $this->config = $config; |
|
104 | - } |
|
103 | + $this->config = $config; |
|
104 | + } |
|
105 | 105 | |
106 | 106 | |
107 | - /** @var ComposerPackage[] */ |
|
108 | - protected array $flatDependencyTree = []; |
|
107 | + /** @var ComposerPackage[] */ |
|
108 | + protected array $flatDependencyTree = []; |
|
109 | 109 | |
110 | - /** |
|
111 | - * 2. Built flat list of packages and dependencies. |
|
112 | - * |
|
113 | - * 2.1 Initiate getting dependencies for the project composer.json. |
|
114 | - * |
|
115 | - * @see Compose::flatDependencyTree |
|
116 | - */ |
|
117 | - protected function buildDependencyList() |
|
118 | - { |
|
110 | + /** |
|
111 | + * 2. Built flat list of packages and dependencies. |
|
112 | + * |
|
113 | + * 2.1 Initiate getting dependencies for the project composer.json. |
|
114 | + * |
|
115 | + * @see Compose::flatDependencyTree |
|
116 | + */ |
|
117 | + protected function buildDependencyList() |
|
118 | + { |
|
119 | 119 | |
120 | - $requiredPackageNames = $this->config->getPackages(); |
|
120 | + $requiredPackageNames = $this->config->getPackages(); |
|
121 | 121 | |
122 | - // Unset PHP, ext-*. |
|
123 | - $removePhpExt = function ($element) { |
|
124 | - return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
125 | - }; |
|
122 | + // Unset PHP, ext-*. |
|
123 | + $removePhpExt = function ($element) { |
|
124 | + return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
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 |
|
131 | - . $requiredPackageName . DIRECTORY_SEPARATOR; |
|
129 | + foreach ($requiredPackageNames as $requiredPackageName) { |
|
130 | + $packageDir = $this->workingDir . 'vendor' .DIRECTORY_SEPARATOR |
|
131 | + . $requiredPackageName . DIRECTORY_SEPARATOR; |
|
132 | 132 | |
133 | - $overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName]) |
|
134 | - ? $this->config->getOverrideAutoload()[$requiredPackageName] |
|
135 | - : null; |
|
133 | + $overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName]) |
|
134 | + ? $this->config->getOverrideAutoload()[$requiredPackageName] |
|
135 | + : null; |
|
136 | 136 | |
137 | - $requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload); |
|
138 | - $this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage; |
|
139 | - $this->getAllDependencies($requiredComposerPackage); |
|
140 | - } |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * 2.2 Recursive function to get dependencies. |
|
145 | - * |
|
146 | - * @param ComposerPackage $requiredDependency |
|
147 | - */ |
|
148 | - protected function getAllDependencies(ComposerPackage $requiredDependency): void |
|
149 | - { |
|
150 | - $excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing(); |
|
137 | + $requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload); |
|
138 | + $this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage; |
|
139 | + $this->getAllDependencies($requiredComposerPackage); |
|
140 | + } |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * 2.2 Recursive function to get dependencies. |
|
145 | + * |
|
146 | + * @param ComposerPackage $requiredDependency |
|
147 | + */ |
|
148 | + protected function getAllDependencies(ComposerPackage $requiredDependency): void |
|
149 | + { |
|
150 | + $excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing(); |
|
151 | 151 | |
152 | - // Unset PHP, ext-*. |
|
153 | - $removePhpExt = function ($element) { |
|
154 | - return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
155 | - }; |
|
152 | + // Unset PHP, ext-*. |
|
153 | + $removePhpExt = function ($element) { |
|
154 | + return !( 0 === strpos($element, 'ext') || 'php' === $element ); |
|
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)) { |
|
161 | - continue; |
|
162 | - } |
|
159 | + foreach ($required as $dependencyName) { |
|
160 | + if (in_array($dependencyName, $excludedPackagesNames)) { |
|
161 | + continue; |
|
162 | + } |
|
163 | 163 | |
164 | - $overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName]) |
|
165 | - ? $this->config->getOverrideAutoload()[$dependencyName] |
|
166 | - : null; |
|
164 | + $overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName]) |
|
165 | + ? $this->config->getOverrideAutoload()[$dependencyName] |
|
166 | + : null; |
|
167 | 167 | |
168 | - $dependencyComposerPackage = new ComposerPackage( |
|
169 | - $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR |
|
170 | - . $dependencyName . DIRECTORY_SEPARATOR . 'composer.json', |
|
171 | - $overrideAutoload |
|
172 | - ); |
|
168 | + $dependencyComposerPackage = new ComposerPackage( |
|
169 | + $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR |
|
170 | + . $dependencyName . DIRECTORY_SEPARATOR . 'composer.json', |
|
171 | + $overrideAutoload |
|
172 | + ); |
|
173 | 173 | |
174 | - $this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage; |
|
175 | - $this->getAllDependencies($dependencyComposerPackage); |
|
176 | - } |
|
177 | - } |
|
178 | - |
|
179 | - protected FileEnumerator $fileEnumerator; |
|
180 | - |
|
181 | - protected function enumerateFiles() |
|
182 | - { |
|
183 | - |
|
184 | - $this->fileEnumerator = new FileEnumerator( |
|
185 | - $this->flatDependencyTree, |
|
186 | - $this->workingDir, |
|
187 | - $this->config |
|
188 | - ); |
|
174 | + $this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage; |
|
175 | + $this->getAllDependencies($dependencyComposerPackage); |
|
176 | + } |
|
177 | + } |
|
178 | + |
|
179 | + protected FileEnumerator $fileEnumerator; |
|
180 | + |
|
181 | + protected function enumerateFiles() |
|
182 | + { |
|
183 | + |
|
184 | + $this->fileEnumerator = new FileEnumerator( |
|
185 | + $this->flatDependencyTree, |
|
186 | + $this->workingDir, |
|
187 | + $this->config |
|
188 | + ); |
|
189 | 189 | |
190 | - $this->fileEnumerator->compileFileList(); |
|
191 | - } |
|
192 | - |
|
193 | - // 3. Copy autoloaded files for each |
|
194 | - protected function copyFiles() |
|
195 | - { |
|
190 | + $this->fileEnumerator->compileFileList(); |
|
191 | + } |
|
192 | + |
|
193 | + // 3. Copy autoloaded files for each |
|
194 | + protected function copyFiles() |
|
195 | + { |
|
196 | 196 | |
197 | - $this->copier = new Copier( |
|
198 | - $this->fileEnumerator->getAllFilesAndDependencyList(), |
|
199 | - $this->workingDir, |
|
200 | - $this->config->getTargetDirectory() |
|
201 | - ); |
|
202 | - |
|
203 | - $this->copier->prepareTarget(); |
|
204 | - |
|
205 | - $this->copier->copy(); |
|
206 | - } |
|
207 | - |
|
208 | - // 4. Determine namespace and classname changes |
|
209 | - protected function determineChanges() |
|
210 | - { |
|
211 | - |
|
212 | - $this->changeEnumerator = new ChangeEnumerator($this->config); |
|
213 | - |
|
214 | - $relativeTargetDir = $this->config->getTargetDirectory(); |
|
215 | - $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
|
216 | - $this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles); |
|
217 | - } |
|
218 | - |
|
219 | - // 5. Update namespaces and class names. |
|
220 | - // Replace references to updated namespaces and classnames throughout the dependencies. |
|
221 | - protected function performReplacements() |
|
222 | - { |
|
223 | - $this->replacer = new Prefixer($this->config, $this->workingDir); |
|
224 | - |
|
225 | - $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements(); |
|
226 | - $classes = $this->changeEnumerator->getDiscoveredClasses(); |
|
197 | + $this->copier = new Copier( |
|
198 | + $this->fileEnumerator->getAllFilesAndDependencyList(), |
|
199 | + $this->workingDir, |
|
200 | + $this->config->getTargetDirectory() |
|
201 | + ); |
|
202 | + |
|
203 | + $this->copier->prepareTarget(); |
|
204 | + |
|
205 | + $this->copier->copy(); |
|
206 | + } |
|
207 | + |
|
208 | + // 4. Determine namespace and classname changes |
|
209 | + protected function determineChanges() |
|
210 | + { |
|
211 | + |
|
212 | + $this->changeEnumerator = new ChangeEnumerator($this->config); |
|
213 | + |
|
214 | + $relativeTargetDir = $this->config->getTargetDirectory(); |
|
215 | + $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
|
216 | + $this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles); |
|
217 | + } |
|
218 | + |
|
219 | + // 5. Update namespaces and class names. |
|
220 | + // Replace references to updated namespaces and classnames throughout the dependencies. |
|
221 | + protected function performReplacements() |
|
222 | + { |
|
223 | + $this->replacer = new Prefixer($this->config, $this->workingDir); |
|
224 | + |
|
225 | + $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements(); |
|
226 | + $classes = $this->changeEnumerator->getDiscoveredClasses(); |
|
227 | 227 | |
228 | - $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
|
228 | + $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList(); |
|
229 | 229 | |
230 | - $this->replacer->replaceInFiles($namespaces, $classes, $phpFiles); |
|
231 | - } |
|
230 | + $this->replacer->replaceInFiles($namespaces, $classes, $phpFiles); |
|
231 | + } |
|
232 | 232 | |
233 | - protected function addLicenses(): void |
|
234 | - { |
|
233 | + protected function addLicenses(): void |
|
234 | + { |
|
235 | 235 | |
236 | - $author = $this->projectComposerPackage->getAuthor(); |
|
236 | + $author = $this->projectComposerPackage->getAuthor(); |
|
237 | 237 | |
238 | - $dependencies = $this->flatDependencyTree; |
|
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 | - $licenser->copyLicenses(); |
|
242 | + $licenser->copyLicenses(); |
|
243 | 243 | |
244 | - $modifiedFiles = $this->replacer->getModifiedFiles(); |
|
245 | - $licenser->addInformationToUpdatedFiles($modifiedFiles); |
|
246 | - } |
|
244 | + $modifiedFiles = $this->replacer->getModifiedFiles(); |
|
245 | + $licenser->addInformationToUpdatedFiles($modifiedFiles); |
|
246 | + } |
|
247 | 247 | |
248 | - /** |
|
249 | - * 6. Generate autoloader. |
|
250 | - */ |
|
251 | - protected function generateAutoloader() |
|
252 | - { |
|
248 | + /** |
|
249 | + * 6. Generate autoloader. |
|
250 | + */ |
|
251 | + protected function generateAutoloader() |
|
252 | + { |
|
253 | 253 | |
254 | - $files = $this->fileEnumerator->getFilesAutoloaders(); |
|
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 | - $classmap->generate(); |
|
259 | - } |
|
258 | + $classmap->generate(); |
|
259 | + } |
|
260 | 260 | |
261 | 261 | |
262 | - /** |
|
263 | - * 7. |
|
264 | - * Delete source files if desired. |
|
265 | - * Delete empty directories in destination. |
|
266 | - */ |
|
267 | - protected function cleanUp() |
|
268 | - { |
|
262 | + /** |
|
263 | + * 7. |
|
264 | + * Delete source files if desired. |
|
265 | + * Delete empty directories in destination. |
|
266 | + */ |
|
267 | + protected function cleanUp() |
|
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 | - // This will check the config to check should it delete or not. |
|
275 | - $cleanup->cleanup($sourceFiles); |
|
276 | - } |
|
274 | + // This will check the config to check should it delete or not. |
|
275 | + $cleanup->cleanup($sourceFiles); |
|
276 | + } |
|
277 | 277 | } |
@@ -7,16 +7,16 @@ |
||
7 | 7 | |
8 | 8 | class Application extends BaseApplication |
9 | 9 | { |
10 | - /** |
|
11 | - * @param string $version |
|
12 | - */ |
|
13 | - public function __construct(string $version) |
|
14 | - { |
|
15 | - parent::__construct('strauss', $version); |
|
10 | + /** |
|
11 | + * @param string $version |
|
12 | + */ |
|
13 | + public function __construct(string $version) |
|
14 | + { |
|
15 | + parent::__construct('strauss', $version); |
|
16 | 16 | |
17 | - $composeCommand = new Compose(); |
|
18 | - $this->add($composeCommand); |
|
17 | + $composeCommand = new Compose(); |
|
18 | + $this->add($composeCommand); |
|
19 | 19 | |
20 | - $this->setDefaultCommand('compose'); |
|
21 | - } |
|
20 | + $this->setDefaultCommand('compose'); |
|
21 | + } |
|
22 | 22 | } |
@@ -27,164 +27,164 @@ |
||
27 | 27 | */ |
28 | 28 | |
29 | 29 | if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
30 | - define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
30 | + define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | if (!is_callable('random_bytes')) { |
34 | - /** |
|
35 | - * Unless open_basedir is enabled, use /dev/urandom for |
|
36 | - * random numbers in accordance with best practices |
|
37 | - * |
|
38 | - * Why we use /dev/urandom and not /dev/random |
|
39 | - * @ref https://www.2uo.de/myths-about-urandom |
|
40 | - * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers |
|
41 | - * |
|
42 | - * @param int $bytes |
|
43 | - * |
|
44 | - * @throws Exception |
|
45 | - * |
|
46 | - * @return string |
|
47 | - */ |
|
48 | - function random_bytes($bytes) |
|
49 | - { |
|
50 | - /** @var resource $fp */ |
|
51 | - static $fp = null; |
|
34 | + /** |
|
35 | + * Unless open_basedir is enabled, use /dev/urandom for |
|
36 | + * random numbers in accordance with best practices |
|
37 | + * |
|
38 | + * Why we use /dev/urandom and not /dev/random |
|
39 | + * @ref https://www.2uo.de/myths-about-urandom |
|
40 | + * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers |
|
41 | + * |
|
42 | + * @param int $bytes |
|
43 | + * |
|
44 | + * @throws Exception |
|
45 | + * |
|
46 | + * @return string |
|
47 | + */ |
|
48 | + function random_bytes($bytes) |
|
49 | + { |
|
50 | + /** @var resource $fp */ |
|
51 | + static $fp = null; |
|
52 | 52 | |
53 | - /** |
|
54 | - * This block should only be run once |
|
55 | - */ |
|
56 | - if (empty($fp)) { |
|
57 | - /** |
|
58 | - * We don't want to ever read C:\dev\random, only /dev/urandom on |
|
59 | - * Unix-like operating systems. While we guard against this |
|
60 | - * condition in random.php, it doesn't hurt to be defensive in depth |
|
61 | - * here. |
|
62 | - * |
|
63 | - * To that end, we only try to open /dev/urandom if we're on a Unix- |
|
64 | - * like operating system (which means the directory separator is set |
|
65 | - * to "/" not "\". |
|
66 | - */ |
|
67 | - if (DIRECTORY_SEPARATOR === '/') { |
|
68 | - if (!is_readable('/dev/urandom')) { |
|
69 | - throw new Exception( |
|
70 | - 'Environment misconfiguration: ' . |
|
71 | - '/dev/urandom cannot be read.' |
|
72 | - ); |
|
73 | - } |
|
74 | - /** |
|
75 | - * We use /dev/urandom if it is a char device. |
|
76 | - * We never fall back to /dev/random |
|
77 | - */ |
|
78 | - /** @var resource|bool $fp */ |
|
79 | - $fp = fopen('/dev/urandom', 'rb'); |
|
80 | - if (is_resource($fp)) { |
|
81 | - /** @var array<string, int> $st */ |
|
82 | - $st = fstat($fp); |
|
83 | - if (($st['mode'] & 0170000) !== 020000) { |
|
84 | - fclose($fp); |
|
85 | - $fp = false; |
|
86 | - } |
|
87 | - } |
|
88 | - } |
|
53 | + /** |
|
54 | + * This block should only be run once |
|
55 | + */ |
|
56 | + if (empty($fp)) { |
|
57 | + /** |
|
58 | + * We don't want to ever read C:\dev\random, only /dev/urandom on |
|
59 | + * Unix-like operating systems. While we guard against this |
|
60 | + * condition in random.php, it doesn't hurt to be defensive in depth |
|
61 | + * here. |
|
62 | + * |
|
63 | + * To that end, we only try to open /dev/urandom if we're on a Unix- |
|
64 | + * like operating system (which means the directory separator is set |
|
65 | + * to "/" not "\". |
|
66 | + */ |
|
67 | + if (DIRECTORY_SEPARATOR === '/') { |
|
68 | + if (!is_readable('/dev/urandom')) { |
|
69 | + throw new Exception( |
|
70 | + 'Environment misconfiguration: ' . |
|
71 | + '/dev/urandom cannot be read.' |
|
72 | + ); |
|
73 | + } |
|
74 | + /** |
|
75 | + * We use /dev/urandom if it is a char device. |
|
76 | + * We never fall back to /dev/random |
|
77 | + */ |
|
78 | + /** @var resource|bool $fp */ |
|
79 | + $fp = fopen('/dev/urandom', 'rb'); |
|
80 | + if (is_resource($fp)) { |
|
81 | + /** @var array<string, int> $st */ |
|
82 | + $st = fstat($fp); |
|
83 | + if (($st['mode'] & 0170000) !== 020000) { |
|
84 | + fclose($fp); |
|
85 | + $fp = false; |
|
86 | + } |
|
87 | + } |
|
88 | + } |
|
89 | 89 | |
90 | - if (is_resource($fp)) { |
|
91 | - /** |
|
92 | - * stream_set_read_buffer() does not exist in HHVM |
|
93 | - * |
|
94 | - * If we don't set the stream's read buffer to 0, PHP will |
|
95 | - * internally buffer 8192 bytes, which can waste entropy |
|
96 | - * |
|
97 | - * stream_set_read_buffer returns 0 on success |
|
98 | - */ |
|
99 | - if (is_callable('stream_set_read_buffer')) { |
|
100 | - stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); |
|
101 | - } |
|
102 | - if (is_callable('stream_set_chunk_size')) { |
|
103 | - stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); |
|
104 | - } |
|
105 | - } |
|
106 | - } |
|
90 | + if (is_resource($fp)) { |
|
91 | + /** |
|
92 | + * stream_set_read_buffer() does not exist in HHVM |
|
93 | + * |
|
94 | + * If we don't set the stream's read buffer to 0, PHP will |
|
95 | + * internally buffer 8192 bytes, which can waste entropy |
|
96 | + * |
|
97 | + * stream_set_read_buffer returns 0 on success |
|
98 | + */ |
|
99 | + if (is_callable('stream_set_read_buffer')) { |
|
100 | + stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); |
|
101 | + } |
|
102 | + if (is_callable('stream_set_chunk_size')) { |
|
103 | + stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); |
|
104 | + } |
|
105 | + } |
|
106 | + } |
|
107 | 107 | |
108 | - try { |
|
109 | - /** @var int $bytes */ |
|
110 | - $bytes = RandomCompat_intval($bytes); |
|
111 | - } catch (TypeError $ex) { |
|
112 | - throw new TypeError( |
|
113 | - 'random_bytes(): $bytes must be an integer' |
|
114 | - ); |
|
115 | - } |
|
108 | + try { |
|
109 | + /** @var int $bytes */ |
|
110 | + $bytes = RandomCompat_intval($bytes); |
|
111 | + } catch (TypeError $ex) { |
|
112 | + throw new TypeError( |
|
113 | + 'random_bytes(): $bytes must be an integer' |
|
114 | + ); |
|
115 | + } |
|
116 | 116 | |
117 | - if ($bytes < 1) { |
|
118 | - throw new Error( |
|
119 | - 'Length must be greater than 0' |
|
120 | - ); |
|
121 | - } |
|
117 | + if ($bytes < 1) { |
|
118 | + throw new Error( |
|
119 | + 'Length must be greater than 0' |
|
120 | + ); |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * This if() block only runs if we managed to open a file handle |
|
125 | - * |
|
126 | - * It does not belong in an else {} block, because the above |
|
127 | - * if (empty($fp)) line is logic that should only be run once per |
|
128 | - * page load. |
|
129 | - */ |
|
130 | - if (is_resource($fp)) { |
|
131 | - /** |
|
132 | - * @var int |
|
133 | - */ |
|
134 | - $remaining = $bytes; |
|
123 | + /** |
|
124 | + * This if() block only runs if we managed to open a file handle |
|
125 | + * |
|
126 | + * It does not belong in an else {} block, because the above |
|
127 | + * if (empty($fp)) line is logic that should only be run once per |
|
128 | + * page load. |
|
129 | + */ |
|
130 | + if (is_resource($fp)) { |
|
131 | + /** |
|
132 | + * @var int |
|
133 | + */ |
|
134 | + $remaining = $bytes; |
|
135 | 135 | |
136 | - /** |
|
137 | - * @var string|bool |
|
138 | - */ |
|
139 | - $buf = ''; |
|
136 | + /** |
|
137 | + * @var string|bool |
|
138 | + */ |
|
139 | + $buf = ''; |
|
140 | 140 | |
141 | - /** |
|
142 | - * We use fread() in a loop to protect against partial reads |
|
143 | - */ |
|
144 | - do { |
|
145 | - /** |
|
146 | - * @var string|bool |
|
147 | - */ |
|
148 | - $read = fread($fp, $remaining); |
|
149 | - if (!is_string($read)) { |
|
150 | - /** |
|
151 | - * We cannot safely read from the file. Exit the |
|
152 | - * do-while loop and trigger the exception condition |
|
153 | - * |
|
154 | - * @var string|bool |
|
155 | - */ |
|
156 | - $buf = false; |
|
157 | - break; |
|
158 | - } |
|
159 | - /** |
|
160 | - * Decrease the number of bytes returned from remaining |
|
161 | - */ |
|
162 | - $remaining -= RandomCompat_strlen($read); |
|
163 | - /** |
|
164 | - * @var string $buf |
|
165 | - */ |
|
166 | - $buf .= $read; |
|
167 | - } while ($remaining > 0); |
|
141 | + /** |
|
142 | + * We use fread() in a loop to protect against partial reads |
|
143 | + */ |
|
144 | + do { |
|
145 | + /** |
|
146 | + * @var string|bool |
|
147 | + */ |
|
148 | + $read = fread($fp, $remaining); |
|
149 | + if (!is_string($read)) { |
|
150 | + /** |
|
151 | + * We cannot safely read from the file. Exit the |
|
152 | + * do-while loop and trigger the exception condition |
|
153 | + * |
|
154 | + * @var string|bool |
|
155 | + */ |
|
156 | + $buf = false; |
|
157 | + break; |
|
158 | + } |
|
159 | + /** |
|
160 | + * Decrease the number of bytes returned from remaining |
|
161 | + */ |
|
162 | + $remaining -= RandomCompat_strlen($read); |
|
163 | + /** |
|
164 | + * @var string $buf |
|
165 | + */ |
|
166 | + $buf .= $read; |
|
167 | + } while ($remaining > 0); |
|
168 | 168 | |
169 | - /** |
|
170 | - * Is our result valid? |
|
171 | - * @var string|bool $buf |
|
172 | - */ |
|
173 | - if (is_string($buf)) { |
|
174 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
175 | - /** |
|
176 | - * Return our random entropy buffer here: |
|
177 | - */ |
|
178 | - return $buf; |
|
179 | - } |
|
180 | - } |
|
181 | - } |
|
169 | + /** |
|
170 | + * Is our result valid? |
|
171 | + * @var string|bool $buf |
|
172 | + */ |
|
173 | + if (is_string($buf)) { |
|
174 | + if (RandomCompat_strlen($buf) === $bytes) { |
|
175 | + /** |
|
176 | + * Return our random entropy buffer here: |
|
177 | + */ |
|
178 | + return $buf; |
|
179 | + } |
|
180 | + } |
|
181 | + } |
|
182 | 182 | |
183 | - /** |
|
184 | - * If we reach here, PHP has failed us. |
|
185 | - */ |
|
186 | - throw new Exception( |
|
187 | - 'Error reading from source device' |
|
188 | - ); |
|
189 | - } |
|
183 | + /** |
|
184 | + * If we reach here, PHP has failed us. |
|
185 | + */ |
|
186 | + throw new Exception( |
|
187 | + 'Error reading from source device' |
|
188 | + ); |
|
189 | + } |
|
190 | 190 | } |
@@ -1,204 +1,204 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | if (!is_callable('random_int')) { |
4 | - /** |
|
5 | - * Random_* Compatibility Library |
|
6 | - * for using the new PHP 7 random_* API in PHP 5 projects |
|
7 | - * |
|
8 | - * The MIT License (MIT) |
|
9 | - * |
|
10 | - * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises |
|
11 | - * |
|
12 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | - * of this software and associated documentation files (the "Software"), to deal |
|
14 | - * in the Software without restriction, including without limitation the rights |
|
15 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | - * copies of the Software, and to permit persons to whom the Software is |
|
17 | - * furnished to do so, subject to the following conditions: |
|
18 | - * |
|
19 | - * The above copyright notice and this permission notice shall be included in |
|
20 | - * all copies or substantial portions of the Software. |
|
21 | - * |
|
22 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | - * SOFTWARE. |
|
29 | - */ |
|
30 | - |
|
31 | - /** |
|
32 | - * Fetch a random integer between $min and $max inclusive |
|
33 | - * |
|
34 | - * @param int $min |
|
35 | - * @param int $max |
|
36 | - * |
|
37 | - * @throws Exception |
|
38 | - * |
|
39 | - * @return int |
|
40 | - */ |
|
41 | - function random_int($min, $max) |
|
42 | - { |
|
43 | - /** |
|
44 | - * Type and input logic checks |
|
45 | - * |
|
46 | - * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
47 | - * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
48 | - * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
49 | - * lose precision, so the <= and => operators might accidentally let a float |
|
50 | - * through. |
|
51 | - */ |
|
52 | - |
|
53 | - try { |
|
54 | - /** @var int $min */ |
|
55 | - $min = RandomCompat_intval($min); |
|
56 | - } catch (TypeError $ex) { |
|
57 | - throw new TypeError( |
|
58 | - 'random_int(): $min must be an integer' |
|
59 | - ); |
|
60 | - } |
|
61 | - |
|
62 | - try { |
|
63 | - /** @var int $max */ |
|
64 | - $max = RandomCompat_intval($max); |
|
65 | - } catch (TypeError $ex) { |
|
66 | - throw new TypeError( |
|
67 | - 'random_int(): $max must be an integer' |
|
68 | - ); |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * Now that we've verified our weak typing system has given us an integer, |
|
73 | - * let's validate the logic then we can move forward with generating random |
|
74 | - * integers along a given range. |
|
75 | - */ |
|
76 | - if ($min > $max) { |
|
77 | - throw new Error( |
|
78 | - 'Minimum value must be less than or equal to the maximum value' |
|
79 | - ); |
|
80 | - } |
|
81 | - |
|
82 | - if ($max === $min) { |
|
83 | - return (int) $min; |
|
84 | - } |
|
85 | - |
|
86 | - /** |
|
87 | - * Initialize variables to 0 |
|
88 | - * |
|
89 | - * We want to store: |
|
90 | - * $bytes => the number of random bytes we need |
|
91 | - * $mask => an integer bitmask (for use with the &) operator |
|
92 | - * so we can minimize the number of discards |
|
93 | - */ |
|
94 | - $attempts = $bits = $bytes = $mask = $valueShift = 0; |
|
95 | - /** @var int $attempts */ |
|
96 | - /** @var int $bits */ |
|
97 | - /** @var int $bytes */ |
|
98 | - /** @var int $mask */ |
|
99 | - /** @var int $valueShift */ |
|
100 | - |
|
101 | - /** |
|
102 | - * At this point, $range is a positive number greater than 0. It might |
|
103 | - * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to |
|
104 | - * a float and we will lose some precision. |
|
105 | - * |
|
106 | - * @var int|float $range |
|
107 | - */ |
|
108 | - $range = $max - $min; |
|
109 | - |
|
110 | - /** |
|
111 | - * Test for integer overflow: |
|
112 | - */ |
|
113 | - if (!is_int($range)) { |
|
114 | - |
|
115 | - /** |
|
116 | - * Still safely calculate wider ranges. |
|
117 | - * Provided by @CodesInChaos, @oittaa |
|
118 | - * |
|
119 | - * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 |
|
120 | - * |
|
121 | - * We use ~0 as a mask in this case because it generates all 1s |
|
122 | - * |
|
123 | - * @ref https://eval.in/400356 (32-bit) |
|
124 | - * @ref http://3v4l.org/XX9r5 (64-bit) |
|
125 | - */ |
|
126 | - $bytes = PHP_INT_SIZE; |
|
127 | - /** @var int $mask */ |
|
128 | - $mask = ~0; |
|
129 | - |
|
130 | - } else { |
|
131 | - |
|
132 | - /** |
|
133 | - * $bits is effectively ceil(log($range, 2)) without dealing with |
|
134 | - * type juggling |
|
135 | - */ |
|
136 | - while ($range > 0) { |
|
137 | - if ($bits % 8 === 0) { |
|
138 | - ++$bytes; |
|
139 | - } |
|
140 | - ++$bits; |
|
141 | - $range >>= 1; |
|
142 | - /** @var int $mask */ |
|
143 | - $mask = $mask << 1 | 1; |
|
144 | - } |
|
145 | - $valueShift = $min; |
|
146 | - } |
|
147 | - |
|
148 | - /** @var int $val */ |
|
149 | - $val = 0; |
|
150 | - /** |
|
151 | - * Now that we have our parameters set up, let's begin generating |
|
152 | - * random integers until one falls between $min and $max |
|
153 | - */ |
|
154 | - /** @psalm-suppress RedundantCondition */ |
|
155 | - do { |
|
156 | - /** |
|
157 | - * The rejection probability is at most 0.5, so this corresponds |
|
158 | - * to a failure probability of 2^-128 for a working RNG |
|
159 | - */ |
|
160 | - if ($attempts > 128) { |
|
161 | - throw new Exception( |
|
162 | - 'random_int: RNG is broken - too many rejections' |
|
163 | - ); |
|
164 | - } |
|
165 | - |
|
166 | - /** |
|
167 | - * Let's grab the necessary number of random bytes |
|
168 | - */ |
|
169 | - $randomByteString = random_bytes($bytes); |
|
170 | - |
|
171 | - /** |
|
172 | - * Let's turn $randomByteString into an integer |
|
173 | - * |
|
174 | - * This uses bitwise operators (<< and |) to build an integer |
|
175 | - * out of the values extracted from ord() |
|
176 | - * |
|
177 | - * Example: [9F] | [6D] | [32] | [0C] => |
|
178 | - * 159 + 27904 + 3276800 + 201326592 => |
|
179 | - * 204631455 |
|
180 | - */ |
|
181 | - $val &= 0; |
|
182 | - for ($i = 0; $i < $bytes; ++$i) { |
|
183 | - $val |= ord($randomByteString[$i]) << ($i * 8); |
|
184 | - } |
|
185 | - /** @var int $val */ |
|
186 | - |
|
187 | - /** |
|
188 | - * Apply mask |
|
189 | - */ |
|
190 | - $val &= $mask; |
|
191 | - $val += $valueShift; |
|
192 | - |
|
193 | - ++$attempts; |
|
194 | - /** |
|
195 | - * If $val overflows to a floating point number, |
|
196 | - * ... or is larger than $max, |
|
197 | - * ... or smaller than $min, |
|
198 | - * then try again. |
|
199 | - */ |
|
200 | - } while (!is_int($val) || $val > $max || $val < $min); |
|
201 | - |
|
202 | - return (int) $val; |
|
203 | - } |
|
4 | + /** |
|
5 | + * Random_* Compatibility Library |
|
6 | + * for using the new PHP 7 random_* API in PHP 5 projects |
|
7 | + * |
|
8 | + * The MIT License (MIT) |
|
9 | + * |
|
10 | + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises |
|
11 | + * |
|
12 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | + * of this software and associated documentation files (the "Software"), to deal |
|
14 | + * in the Software without restriction, including without limitation the rights |
|
15 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | + * copies of the Software, and to permit persons to whom the Software is |
|
17 | + * furnished to do so, subject to the following conditions: |
|
18 | + * |
|
19 | + * The above copyright notice and this permission notice shall be included in |
|
20 | + * all copies or substantial portions of the Software. |
|
21 | + * |
|
22 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | + * SOFTWARE. |
|
29 | + */ |
|
30 | + |
|
31 | + /** |
|
32 | + * Fetch a random integer between $min and $max inclusive |
|
33 | + * |
|
34 | + * @param int $min |
|
35 | + * @param int $max |
|
36 | + * |
|
37 | + * @throws Exception |
|
38 | + * |
|
39 | + * @return int |
|
40 | + */ |
|
41 | + function random_int($min, $max) |
|
42 | + { |
|
43 | + /** |
|
44 | + * Type and input logic checks |
|
45 | + * |
|
46 | + * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
47 | + * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
48 | + * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
49 | + * lose precision, so the <= and => operators might accidentally let a float |
|
50 | + * through. |
|
51 | + */ |
|
52 | + |
|
53 | + try { |
|
54 | + /** @var int $min */ |
|
55 | + $min = RandomCompat_intval($min); |
|
56 | + } catch (TypeError $ex) { |
|
57 | + throw new TypeError( |
|
58 | + 'random_int(): $min must be an integer' |
|
59 | + ); |
|
60 | + } |
|
61 | + |
|
62 | + try { |
|
63 | + /** @var int $max */ |
|
64 | + $max = RandomCompat_intval($max); |
|
65 | + } catch (TypeError $ex) { |
|
66 | + throw new TypeError( |
|
67 | + 'random_int(): $max must be an integer' |
|
68 | + ); |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * Now that we've verified our weak typing system has given us an integer, |
|
73 | + * let's validate the logic then we can move forward with generating random |
|
74 | + * integers along a given range. |
|
75 | + */ |
|
76 | + if ($min > $max) { |
|
77 | + throw new Error( |
|
78 | + 'Minimum value must be less than or equal to the maximum value' |
|
79 | + ); |
|
80 | + } |
|
81 | + |
|
82 | + if ($max === $min) { |
|
83 | + return (int) $min; |
|
84 | + } |
|
85 | + |
|
86 | + /** |
|
87 | + * Initialize variables to 0 |
|
88 | + * |
|
89 | + * We want to store: |
|
90 | + * $bytes => the number of random bytes we need |
|
91 | + * $mask => an integer bitmask (for use with the &) operator |
|
92 | + * so we can minimize the number of discards |
|
93 | + */ |
|
94 | + $attempts = $bits = $bytes = $mask = $valueShift = 0; |
|
95 | + /** @var int $attempts */ |
|
96 | + /** @var int $bits */ |
|
97 | + /** @var int $bytes */ |
|
98 | + /** @var int $mask */ |
|
99 | + /** @var int $valueShift */ |
|
100 | + |
|
101 | + /** |
|
102 | + * At this point, $range is a positive number greater than 0. It might |
|
103 | + * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to |
|
104 | + * a float and we will lose some precision. |
|
105 | + * |
|
106 | + * @var int|float $range |
|
107 | + */ |
|
108 | + $range = $max - $min; |
|
109 | + |
|
110 | + /** |
|
111 | + * Test for integer overflow: |
|
112 | + */ |
|
113 | + if (!is_int($range)) { |
|
114 | + |
|
115 | + /** |
|
116 | + * Still safely calculate wider ranges. |
|
117 | + * Provided by @CodesInChaos, @oittaa |
|
118 | + * |
|
119 | + * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 |
|
120 | + * |
|
121 | + * We use ~0 as a mask in this case because it generates all 1s |
|
122 | + * |
|
123 | + * @ref https://eval.in/400356 (32-bit) |
|
124 | + * @ref http://3v4l.org/XX9r5 (64-bit) |
|
125 | + */ |
|
126 | + $bytes = PHP_INT_SIZE; |
|
127 | + /** @var int $mask */ |
|
128 | + $mask = ~0; |
|
129 | + |
|
130 | + } else { |
|
131 | + |
|
132 | + /** |
|
133 | + * $bits is effectively ceil(log($range, 2)) without dealing with |
|
134 | + * type juggling |
|
135 | + */ |
|
136 | + while ($range > 0) { |
|
137 | + if ($bits % 8 === 0) { |
|
138 | + ++$bytes; |
|
139 | + } |
|
140 | + ++$bits; |
|
141 | + $range >>= 1; |
|
142 | + /** @var int $mask */ |
|
143 | + $mask = $mask << 1 | 1; |
|
144 | + } |
|
145 | + $valueShift = $min; |
|
146 | + } |
|
147 | + |
|
148 | + /** @var int $val */ |
|
149 | + $val = 0; |
|
150 | + /** |
|
151 | + * Now that we have our parameters set up, let's begin generating |
|
152 | + * random integers until one falls between $min and $max |
|
153 | + */ |
|
154 | + /** @psalm-suppress RedundantCondition */ |
|
155 | + do { |
|
156 | + /** |
|
157 | + * The rejection probability is at most 0.5, so this corresponds |
|
158 | + * to a failure probability of 2^-128 for a working RNG |
|
159 | + */ |
|
160 | + if ($attempts > 128) { |
|
161 | + throw new Exception( |
|
162 | + 'random_int: RNG is broken - too many rejections' |
|
163 | + ); |
|
164 | + } |
|
165 | + |
|
166 | + /** |
|
167 | + * Let's grab the necessary number of random bytes |
|
168 | + */ |
|
169 | + $randomByteString = random_bytes($bytes); |
|
170 | + |
|
171 | + /** |
|
172 | + * Let's turn $randomByteString into an integer |
|
173 | + * |
|
174 | + * This uses bitwise operators (<< and |) to build an integer |
|
175 | + * out of the values extracted from ord() |
|
176 | + * |
|
177 | + * Example: [9F] | [6D] | [32] | [0C] => |
|
178 | + * 159 + 27904 + 3276800 + 201326592 => |
|
179 | + * 204631455 |
|
180 | + */ |
|
181 | + $val &= 0; |
|
182 | + for ($i = 0; $i < $bytes; ++$i) { |
|
183 | + $val |= ord($randomByteString[$i]) << ($i * 8); |
|
184 | + } |
|
185 | + /** @var int $val */ |
|
186 | + |
|
187 | + /** |
|
188 | + * Apply mask |
|
189 | + */ |
|
190 | + $val &= $mask; |
|
191 | + $val += $valueShift; |
|
192 | + |
|
193 | + ++$attempts; |
|
194 | + /** |
|
195 | + * If $val overflows to a floating point number, |
|
196 | + * ... or is larger than $max, |
|
197 | + * ... or smaller than $min, |
|
198 | + * then try again. |
|
199 | + */ |
|
200 | + } while (!is_int($val) || $val > $max || $val < $min); |
|
201 | + |
|
202 | + return (int) $val; |
|
203 | + } |
|
204 | 204 | } |
@@ -27,67 +27,67 @@ |
||
27 | 27 | */ |
28 | 28 | |
29 | 29 | if (!is_callable('random_bytes')) { |
30 | - /** |
|
31 | - * If the libsodium PHP extension is loaded, we'll use it above any other |
|
32 | - * solution. |
|
33 | - * |
|
34 | - * libsodium-php project: |
|
35 | - * @ref https://github.com/jedisct1/libsodium-php |
|
36 | - * |
|
37 | - * @param int $bytes |
|
38 | - * |
|
39 | - * @throws Exception |
|
40 | - * |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - function random_bytes($bytes) |
|
44 | - { |
|
45 | - try { |
|
46 | - /** @var int $bytes */ |
|
47 | - $bytes = RandomCompat_intval($bytes); |
|
48 | - } catch (TypeError $ex) { |
|
49 | - throw new TypeError( |
|
50 | - 'random_bytes(): $bytes must be an integer' |
|
51 | - ); |
|
52 | - } |
|
30 | + /** |
|
31 | + * If the libsodium PHP extension is loaded, we'll use it above any other |
|
32 | + * solution. |
|
33 | + * |
|
34 | + * libsodium-php project: |
|
35 | + * @ref https://github.com/jedisct1/libsodium-php |
|
36 | + * |
|
37 | + * @param int $bytes |
|
38 | + * |
|
39 | + * @throws Exception |
|
40 | + * |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + function random_bytes($bytes) |
|
44 | + { |
|
45 | + try { |
|
46 | + /** @var int $bytes */ |
|
47 | + $bytes = RandomCompat_intval($bytes); |
|
48 | + } catch (TypeError $ex) { |
|
49 | + throw new TypeError( |
|
50 | + 'random_bytes(): $bytes must be an integer' |
|
51 | + ); |
|
52 | + } |
|
53 | 53 | |
54 | - if ($bytes < 1) { |
|
55 | - throw new Error( |
|
56 | - 'Length must be greater than 0' |
|
57 | - ); |
|
58 | - } |
|
54 | + if ($bytes < 1) { |
|
55 | + throw new Error( |
|
56 | + 'Length must be greater than 0' |
|
57 | + ); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @var string |
|
62 | - */ |
|
63 | - $buf = ''; |
|
60 | + /** |
|
61 | + * @var string |
|
62 | + */ |
|
63 | + $buf = ''; |
|
64 | 64 | |
65 | - /** |
|
66 | - * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
67 | - * generated in one invocation. |
|
68 | - */ |
|
69 | - if ($bytes > 2147483647) { |
|
70 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
71 | - $n = ($bytes - $i) > 1073741824 |
|
72 | - ? 1073741824 |
|
73 | - : $bytes - $i; |
|
74 | - $buf .= Sodium::randombytes_buf((int) $n); |
|
75 | - } |
|
76 | - } else { |
|
77 | - $buf .= Sodium::randombytes_buf((int) $bytes); |
|
78 | - } |
|
65 | + /** |
|
66 | + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
67 | + * generated in one invocation. |
|
68 | + */ |
|
69 | + if ($bytes > 2147483647) { |
|
70 | + for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
71 | + $n = ($bytes - $i) > 1073741824 |
|
72 | + ? 1073741824 |
|
73 | + : $bytes - $i; |
|
74 | + $buf .= Sodium::randombytes_buf((int) $n); |
|
75 | + } |
|
76 | + } else { |
|
77 | + $buf .= Sodium::randombytes_buf((int) $bytes); |
|
78 | + } |
|
79 | 79 | |
80 | - if (is_string($buf)) { |
|
81 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
82 | - return $buf; |
|
83 | - } |
|
84 | - } |
|
80 | + if (is_string($buf)) { |
|
81 | + if (RandomCompat_strlen($buf) === $bytes) { |
|
82 | + return $buf; |
|
83 | + } |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * If we reach here, PHP has failed us. |
|
88 | - */ |
|
89 | - throw new Exception( |
|
90 | - 'Could not gather sufficient random data' |
|
91 | - ); |
|
92 | - } |
|
86 | + /** |
|
87 | + * If we reach here, PHP has failed us. |
|
88 | + */ |
|
89 | + throw new Exception( |
|
90 | + 'Could not gather sufficient random data' |
|
91 | + ); |
|
92 | + } |
|
93 | 93 | } |
@@ -28,50 +28,50 @@ |
||
28 | 28 | |
29 | 29 | if (!is_callable('RandomCompat_intval')) { |
30 | 30 | |
31 | - /** |
|
32 | - * Cast to an integer if we can, safely. |
|
33 | - * |
|
34 | - * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
35 | - * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
36 | - * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
37 | - * lose precision, so the <= and => operators might accidentally let a float |
|
38 | - * through. |
|
39 | - * |
|
40 | - * @param int|float $number The number we want to convert to an int |
|
41 | - * @param bool $fail_open Set to true to not throw an exception |
|
42 | - * |
|
43 | - * @return float|int |
|
44 | - * @psalm-suppress InvalidReturnType |
|
45 | - * |
|
46 | - * @throws TypeError |
|
47 | - */ |
|
48 | - function RandomCompat_intval($number, $fail_open = false) |
|
49 | - { |
|
50 | - if (is_int($number) || is_float($number)) { |
|
51 | - $number += 0; |
|
52 | - } elseif (is_numeric($number)) { |
|
53 | - /** @psalm-suppress InvalidOperand */ |
|
54 | - $number += 0; |
|
55 | - } |
|
56 | - /** @var int|float $number */ |
|
31 | + /** |
|
32 | + * Cast to an integer if we can, safely. |
|
33 | + * |
|
34 | + * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
35 | + * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
36 | + * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
37 | + * lose precision, so the <= and => operators might accidentally let a float |
|
38 | + * through. |
|
39 | + * |
|
40 | + * @param int|float $number The number we want to convert to an int |
|
41 | + * @param bool $fail_open Set to true to not throw an exception |
|
42 | + * |
|
43 | + * @return float|int |
|
44 | + * @psalm-suppress InvalidReturnType |
|
45 | + * |
|
46 | + * @throws TypeError |
|
47 | + */ |
|
48 | + function RandomCompat_intval($number, $fail_open = false) |
|
49 | + { |
|
50 | + if (is_int($number) || is_float($number)) { |
|
51 | + $number += 0; |
|
52 | + } elseif (is_numeric($number)) { |
|
53 | + /** @psalm-suppress InvalidOperand */ |
|
54 | + $number += 0; |
|
55 | + } |
|
56 | + /** @var int|float $number */ |
|
57 | 57 | |
58 | - if ( |
|
59 | - is_float($number) |
|
60 | - && |
|
61 | - $number > ~PHP_INT_MAX |
|
62 | - && |
|
63 | - $number < PHP_INT_MAX |
|
64 | - ) { |
|
65 | - $number = (int) $number; |
|
66 | - } |
|
58 | + if ( |
|
59 | + is_float($number) |
|
60 | + && |
|
61 | + $number > ~PHP_INT_MAX |
|
62 | + && |
|
63 | + $number < PHP_INT_MAX |
|
64 | + ) { |
|
65 | + $number = (int) $number; |
|
66 | + } |
|
67 | 67 | |
68 | - if (is_int($number)) { |
|
69 | - return (int) $number; |
|
70 | - } elseif (!$fail_open) { |
|
71 | - throw new TypeError( |
|
72 | - 'Expected an integer.' |
|
73 | - ); |
|
74 | - } |
|
75 | - return $number; |
|
76 | - } |
|
68 | + if (is_int($number)) { |
|
69 | + return (int) $number; |
|
70 | + } elseif (!$fail_open) { |
|
71 | + throw new TypeError( |
|
72 | + 'Expected an integer.' |
|
73 | + ); |
|
74 | + } |
|
75 | + return $number; |
|
76 | + } |
|
77 | 77 | } |
@@ -27,53 +27,53 @@ |
||
27 | 27 | */ |
28 | 28 | |
29 | 29 | if (!is_callable('random_bytes')) { |
30 | - /** |
|
31 | - * Powered by ext/mcrypt (and thankfully NOT libmcrypt) |
|
32 | - * |
|
33 | - * @ref https://bugs.php.net/bug.php?id=55169 |
|
34 | - * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386 |
|
35 | - * |
|
36 | - * @param int $bytes |
|
37 | - * |
|
38 | - * @throws Exception |
|
39 | - * |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - function random_bytes($bytes) |
|
43 | - { |
|
44 | - try { |
|
45 | - /** @var int $bytes */ |
|
46 | - $bytes = RandomCompat_intval($bytes); |
|
47 | - } catch (TypeError $ex) { |
|
48 | - throw new TypeError( |
|
49 | - 'random_bytes(): $bytes must be an integer' |
|
50 | - ); |
|
51 | - } |
|
30 | + /** |
|
31 | + * Powered by ext/mcrypt (and thankfully NOT libmcrypt) |
|
32 | + * |
|
33 | + * @ref https://bugs.php.net/bug.php?id=55169 |
|
34 | + * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386 |
|
35 | + * |
|
36 | + * @param int $bytes |
|
37 | + * |
|
38 | + * @throws Exception |
|
39 | + * |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + function random_bytes($bytes) |
|
43 | + { |
|
44 | + try { |
|
45 | + /** @var int $bytes */ |
|
46 | + $bytes = RandomCompat_intval($bytes); |
|
47 | + } catch (TypeError $ex) { |
|
48 | + throw new TypeError( |
|
49 | + 'random_bytes(): $bytes must be an integer' |
|
50 | + ); |
|
51 | + } |
|
52 | 52 | |
53 | - if ($bytes < 1) { |
|
54 | - throw new Error( |
|
55 | - 'Length must be greater than 0' |
|
56 | - ); |
|
57 | - } |
|
53 | + if ($bytes < 1) { |
|
54 | + throw new Error( |
|
55 | + 'Length must be greater than 0' |
|
56 | + ); |
|
57 | + } |
|
58 | 58 | |
59 | - /** @var string|bool $buf */ |
|
60 | - $buf = @mcrypt_create_iv((int) $bytes, (int) MCRYPT_DEV_URANDOM); |
|
61 | - if ( |
|
62 | - is_string($buf) |
|
63 | - && |
|
64 | - RandomCompat_strlen($buf) === $bytes |
|
65 | - ) { |
|
66 | - /** |
|
67 | - * Return our random entropy buffer here: |
|
68 | - */ |
|
69 | - return $buf; |
|
70 | - } |
|
59 | + /** @var string|bool $buf */ |
|
60 | + $buf = @mcrypt_create_iv((int) $bytes, (int) MCRYPT_DEV_URANDOM); |
|
61 | + if ( |
|
62 | + is_string($buf) |
|
63 | + && |
|
64 | + RandomCompat_strlen($buf) === $bytes |
|
65 | + ) { |
|
66 | + /** |
|
67 | + * Return our random entropy buffer here: |
|
68 | + */ |
|
69 | + return $buf; |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * If we reach here, PHP has failed us. |
|
74 | - */ |
|
75 | - throw new Exception( |
|
76 | - 'Could not gather sufficient random data' |
|
77 | - ); |
|
78 | - } |
|
72 | + /** |
|
73 | + * If we reach here, PHP has failed us. |
|
74 | + */ |
|
75 | + throw new Exception( |
|
76 | + 'Could not gather sufficient random data' |
|
77 | + ); |
|
78 | + } |
|
79 | 79 | } |
@@ -27,65 +27,65 @@ |
||
27 | 27 | */ |
28 | 28 | |
29 | 29 | if (!is_callable('random_bytes')) { |
30 | - /** |
|
31 | - * If the libsodium PHP extension is loaded, we'll use it above any other |
|
32 | - * solution. |
|
33 | - * |
|
34 | - * libsodium-php project: |
|
35 | - * @ref https://github.com/jedisct1/libsodium-php |
|
36 | - * |
|
37 | - * @param int $bytes |
|
38 | - * |
|
39 | - * @throws Exception |
|
40 | - * |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - function random_bytes($bytes) |
|
44 | - { |
|
45 | - try { |
|
46 | - /** @var int $bytes */ |
|
47 | - $bytes = RandomCompat_intval($bytes); |
|
48 | - } catch (TypeError $ex) { |
|
49 | - throw new TypeError( |
|
50 | - 'random_bytes(): $bytes must be an integer' |
|
51 | - ); |
|
52 | - } |
|
30 | + /** |
|
31 | + * If the libsodium PHP extension is loaded, we'll use it above any other |
|
32 | + * solution. |
|
33 | + * |
|
34 | + * libsodium-php project: |
|
35 | + * @ref https://github.com/jedisct1/libsodium-php |
|
36 | + * |
|
37 | + * @param int $bytes |
|
38 | + * |
|
39 | + * @throws Exception |
|
40 | + * |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + function random_bytes($bytes) |
|
44 | + { |
|
45 | + try { |
|
46 | + /** @var int $bytes */ |
|
47 | + $bytes = RandomCompat_intval($bytes); |
|
48 | + } catch (TypeError $ex) { |
|
49 | + throw new TypeError( |
|
50 | + 'random_bytes(): $bytes must be an integer' |
|
51 | + ); |
|
52 | + } |
|
53 | 53 | |
54 | - if ($bytes < 1) { |
|
55 | - throw new Error( |
|
56 | - 'Length must be greater than 0' |
|
57 | - ); |
|
58 | - } |
|
54 | + if ($bytes < 1) { |
|
55 | + throw new Error( |
|
56 | + 'Length must be greater than 0' |
|
57 | + ); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
62 | - * generated in one invocation. |
|
63 | - */ |
|
64 | - /** @var string|bool $buf */ |
|
65 | - if ($bytes > 2147483647) { |
|
66 | - $buf = ''; |
|
67 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
68 | - $n = ($bytes - $i) > 1073741824 |
|
69 | - ? 1073741824 |
|
70 | - : $bytes - $i; |
|
71 | - $buf .= \Sodium\randombytes_buf($n); |
|
72 | - } |
|
73 | - } else { |
|
74 | - /** @var string|bool $buf */ |
|
75 | - $buf = \Sodium\randombytes_buf($bytes); |
|
76 | - } |
|
60 | + /** |
|
61 | + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
62 | + * generated in one invocation. |
|
63 | + */ |
|
64 | + /** @var string|bool $buf */ |
|
65 | + if ($bytes > 2147483647) { |
|
66 | + $buf = ''; |
|
67 | + for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
68 | + $n = ($bytes - $i) > 1073741824 |
|
69 | + ? 1073741824 |
|
70 | + : $bytes - $i; |
|
71 | + $buf .= \Sodium\randombytes_buf($n); |
|
72 | + } |
|
73 | + } else { |
|
74 | + /** @var string|bool $buf */ |
|
75 | + $buf = \Sodium\randombytes_buf($bytes); |
|
76 | + } |
|
77 | 77 | |
78 | - if (is_string($buf)) { |
|
79 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
80 | - return $buf; |
|
81 | - } |
|
82 | - } |
|
78 | + if (is_string($buf)) { |
|
79 | + if (RandomCompat_strlen($buf) === $bytes) { |
|
80 | + return $buf; |
|
81 | + } |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * If we reach here, PHP has failed us. |
|
86 | - */ |
|
87 | - throw new Exception( |
|
88 | - 'Could not gather sufficient random data' |
|
89 | - ); |
|
90 | - } |
|
84 | + /** |
|
85 | + * If we reach here, PHP has failed us. |
|
86 | + */ |
|
87 | + throw new Exception( |
|
88 | + 'Could not gather sufficient random data' |
|
89 | + ); |
|
90 | + } |
|
91 | 91 | } |