removed dependency on ext-mbstring (#94)

prisis · web-flow · commit 0271bded7fae · 2018-11-02T15:22:03.000+01:00
| Q               | A
| --------------- | ---
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | -
| License         | MIT
| Doc PR          | -
diff --git a/composer.json b/composer.json
@@ -26,7 +26,6 @@
     ],
     "require": {
         "php": "^7.1",
-        "ext-mbstring": "*",
         "ext-json": "*",
         "ext-tokenizer": "*",
         "composer-plugin-api": "^1.0"
diff --git a/src/Automatic/Automatic.php b/src/Automatic/Automatic.php
@@ -201,7 +201,7 @@ public function activate(Composer $composer, IOInterface $io): void
         // that way, we are sure to use all files from the same version.
         foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(\dirname(__DIR__, 1), FilesystemIterator::SKIP_DOTS)) as $file) {
             /** @var \SplFileInfo $file */
-            if (\mb_substr($file->getFilename(), -4) === '.php') {
+            if (\substr($file->getFilename(), -4) === '.php') {
                 require_once $file;
             }
         }
@@ -743,7 +743,7 @@ public function whatProvides(Pool $pool, $name, $bypassFilters = false)
         }, clone $pool, $pool)();
 
         foreach ($event->getRequest()->getJobs() as $job) {
-            if ($job['cmd'] !== 'install' || \mb_strpos($job['packageName'], '/') === false) {
+            if ($job['cmd'] !== 'install' || \strpos($job['packageName'], '/') === false) {
                 continue;
             }
 
@@ -756,7 +756,7 @@ public function whatProvides(Pool $pool, $name, $bypassFilters = false)
             foreach ($pool->whatProvides($packageName, $constraint, true) as $package) {
                 /** @var \Composer\Package\Link $link */
                 foreach (\array_merge($package->getRequires(), $package->getConflicts(), $package->getReplaces()) as $link) {
-                    if (isset($listed[$link->getTarget()]) || \mb_strpos($link->getTarget(), '/') === false) {
+                    if (isset($listed[$link->getTarget()]) || \strpos($link->getTarget(), '/') === false) {
                         continue;
                     }
 
@@ -838,7 +838,7 @@ private function addLegacyTags(IOInterface $io, array $requires, LegacyTagsManag
                 continue;
             }
 
-            if (\mb_strpos($name, '/') === false) {
+            if (\strpos($name, '/') === false) {
                 $io->writeError(\sprintf('Constrain [%s] skipped, package name [%s] without a slash is not supported', $version, $name));
 
                 continue;
diff --git a/src/Automatic/Configurator/EnvConfigurator.php b/src/Automatic/Configurator/EnvConfigurator.php
@@ -35,7 +35,7 @@ public function configure(PackageContract $package): void
         $data = '';
 
         foreach ((array) $package->getConfig(ConfiguratorContract::TYPE, self::getName()) as $key => $value) {
-            if (\mb_strpos($key, '#') === 0 && \is_numeric(\mb_substr($key, 1))) {
+            if (\strpos($key, '#') === 0 && \is_numeric(\substr($key, 1))) {
                 $data .= '# ' . $value . \PHP_EOL;
 
                 continue;
diff --git a/src/Automatic/Installer/InstallationManager.php b/src/Automatic/Installer/InstallationManager.php
@@ -30,7 +30,7 @@ public function install(array $requires, array $devRequires = []): void
         $rootPackages = [];
 
         foreach ($this->getRootRequires() as $link) {
-            $rootPackages[\mb_strtolower($link->getTarget())] = (string) $link->getConstraint();
+            $rootPackages[\strtolower($link->getTarget())] = (string) $link->getConstraint();
         }
 
         $requiresToInstall    = $this->preparePackagesToInstall($requires, $rootPackages);
@@ -124,7 +124,7 @@ protected function preparePackagesToInstall(array $requires, array $rootPackages
             // Check if package is currently installed, if so, use installed constraint.
             if (isset($toInstall[$packageName])) {
                 $version    = $toInstall[$packageName];
-                $constraint = \mb_strpos($version, 'dev') === false ? '^' . $version : $version;
+                $constraint = \strpos($version, 'dev') === false ? '^' . $version : $version;
 
                 $toInstall[$packageName] = $constraint;
 
diff --git a/src/Automatic/LegacyTagsManager.php b/src/Automatic/LegacyTagsManager.php
@@ -73,7 +73,7 @@ public function hasProvider(string $file): bool
         foreach ($this->legacyTags as $name => $constraint) {
             [$namespace, $packageName] = \explode('/', $name, 2);
 
-            if (\mb_strpos($file, \sprintf('provider-%s$', $namespace)) !== false) {
+            if (\strpos($file, \sprintf('provider-%s$', $namespace)) !== false) {
                 return true;
             }
         }
diff --git a/src/Automatic/Operation/AbstractOperation.php b/src/Automatic/Operation/AbstractOperation.php
@@ -155,7 +155,7 @@ protected function findClassesInAutomaticFolder(PackageContract $package, string
         if (\count($composerAutoload) !== 0) {
             $classes = $this->classFinder->setComposerAutoload($name, $composerAutoload)
                 ->setFilter(function (\SplFileInfo $fileInfo) use ($name) {
-                    return \mb_strpos((string) \mb_strstr($fileInfo->getPathname(), $name), \DIRECTORY_SEPARATOR . 'Automatic' . \DIRECTORY_SEPARATOR) !== false;
+                    return \strpos((string) \strstr($fileInfo->getPathname(), $name), \DIRECTORY_SEPARATOR . 'Automatic' . \DIRECTORY_SEPARATOR) !== false;
                 })
                 ->find()
                 ->getAll();
diff --git a/src/Automatic/Operation/Install.php b/src/Automatic/Operation/Install.php
@@ -99,7 +99,7 @@ private function getPackageVersion(PackageInterface $package): string
         $version = $package->getPrettyVersion();
         $extra   = $package->getExtra();
 
-        if (isset($extra['branch-alias']) && \mb_strpos($version, 'dev-') === 0) {
+        if (isset($extra['branch-alias']) && \strpos($version, 'dev-') === 0) {
             $branchAliases = $extra['branch-alias'];
 
             if (
@@ -131,7 +131,7 @@ private function createAutomaticPackage(PackageInterface $composerPackage, strin
         foreach ($composerPackage->getRequires() as $link) {
             $target = $link->getTarget();
 
-            if ($target === 'php' || \mb_strpos($target, 'ext-') === 0) {
+            if ($target === 'php' || \strpos($target, 'ext-') === 0) {
                 continue;
             }
 
diff --git a/src/Automatic/Prefetcher/CurlDownloader.php b/src/Automatic/Prefetcher/CurlDownloader.php
@@ -123,7 +123,7 @@ public function get(string $url, $context, ?string $file): array
         } else {
             $headers[] = 'Connection: keep-alive';
 
-            if (\mb_strpos($url, 'https://') === 0 && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (\CURL_VERSION_HTTP2 & \curl_version()['features'])) {
+            if (\strpos($url, 'https://') === 0 && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (\CURL_VERSION_HTTP2 & \curl_version()['features'])) {
                 \curl_setopt($ch, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_2_0);
             }
         }
diff --git a/src/Automatic/Prefetcher/ParallelDownloader.php b/src/Automatic/Prefetcher/ParallelDownloader.php
@@ -176,7 +176,7 @@ public function download(array &$nextArgs, callable $nextCallback, bool $quiet =
                 $this->io->writeError('<warning>Enable the "cURL" PHP extension for faster downloads</warning>');
             }
 
-            $note = \DIRECTORY_SEPARATOR === '\\' ? '' : (\mb_stripos(\PHP_OS, 'darwin') !== false ? '🎵' : '🎶');
+            $note = \DIRECTORY_SEPARATOR === '\\' ? '' : (\stripos(\PHP_OS, 'darwin') !== false ? '🎵' : '🎶');
             $note .= $this->downloader !== null ? (\DIRECTORY_SEPARATOR !== '\\' ? ' 💨' : '') : '';
 
             $this->io->writeError('');
diff --git a/src/Automatic/Prefetcher/Prefetcher.php b/src/Automatic/Prefetcher/Prefetcher.php
@@ -113,7 +113,7 @@ public function prefetchComposerRepositories(RemoteFilesystem $remoteFilesystem)
 
         if ($pluginManager instanceof PluginManager) {
             foreach ($pluginManager->getPlugins() as $plugin) {
-                if (\mb_strpos(\get_class($plugin), PrestissimoPlugin::class) === 0) {
+                if (\strpos(\get_class($plugin), PrestissimoPlugin::class) === 0) {
                     if (\method_exists($remoteFilesystem, 'getRemoteContents')) {
                         $plugin->disable();
                     } else {
diff --git a/src/Automatic/QuestionFactory.php b/src/Automatic/QuestionFactory.php
@@ -60,7 +60,7 @@ public static function validatePackageQuestionAnswer(?string $value): string
             return 'n';
         }
 
-        $value = \mb_strtolower($value[0]);
+        $value = \strtolower($value[0]);
 
         if (! \in_array($value, ['y', 'n', 'a', 'p'], true)) {
             throw new InvalidArgumentException('Invalid choice.');
diff --git a/src/Common/Configurator/AbstractConfigurator.php b/src/Common/Configurator/AbstractConfigurator.php
@@ -92,7 +92,7 @@ protected function write($messages): void
      */
     protected function isFileMarked(string $packageName, string $file): bool
     {
-        return \is_file($file) && \mb_strpos((string) \file_get_contents($file), \sprintf('###> %s ###', $packageName)) !== false;
+        return \is_file($file) && \strpos((string) \file_get_contents($file), \sprintf('###> %s ###', $packageName)) !== false;
     }
 
     /**
@@ -122,6 +122,6 @@ protected function markData(string $packageName, string $data, int $spaceMultipl
      */
     protected function doInsertStringBeforePosition(string $string, string $insertStr, int $position): string
     {
-        return \mb_substr($string, 0, $position) . $insertStr . \mb_substr($string, $position);
+        return \substr($string, 0, $position) . $insertStr . \substr($string, $position);
     }
 }
diff --git a/src/Common/Installer/AbstractInstallationManager.php b/src/Common/Installer/AbstractInstallationManager.php
@@ -131,7 +131,7 @@ public function __construct(Composer $composer, IOInterface $io, InputInterface
         $this->localRepository = $this->composer->getRepositoryManager()->getLocalRepository();
 
         foreach ($this->localRepository->getPackages() as $package) {
-            $this->installedPackages[\mb_strtolower($package->getName())] = \ltrim($package->getPrettyVersion(), 'v');
+            $this->installedPackages[\strtolower($package->getName())] = \ltrim($package->getPrettyVersion(), 'v');
         }
     }
 
diff --git a/src/Common/Package.php b/src/Common/Package.php
@@ -101,7 +101,7 @@ final class Package implements PackageContract
     public function __construct(string $name, ?string $prettyVersion)
     {
         $this->prettyName    = $name;
-        $this->name          = \mb_strtolower($name);
+        $this->name          = \strtolower($name);
         $this->prettyVersion = $prettyVersion;
         $this->created       = (new \DateTimeImmutable())->format(\DateTime::RFC3339);
     }
diff --git a/src/Common/README.md b/src/Common/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Narrowspark Automatic</h1>
 <p align="center">
     <a href="https://github.com/narrowspark/automatic/releases"><img src="https://img.shields.io/packagist/v/narrowspark/automatic.svg?style=flat-square"></a>
-    <a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.2.0-8892BF.svg?style=flat-square"></a>
+    <a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.1.0-8892BF.svg?style=flat-square"></a>
     <a href="https://codecov.io/gh/narrowspark/automatic"><img src="https://img.shields.io/codecov/c/github/narrowspark/automatic/master.svg?style=flat-square"></a>
     <a href="#"><img src="https://img.shields.io/badge/style-level%207-brightgreen.svg?style=flat-square&label=phpstan"></a>
     <a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
diff --git a/src/Common/Traits/ExpandTargetDirTrait.php b/src/Common/Traits/ExpandTargetDirTrait.php
@@ -18,7 +18,7 @@ public static function expandTargetDir(array $options, string $target): string
             return $target;
         }
 
-        $option = \str_replace('_', '-', \mb_strtolower($matches[1]));
+        $option = \str_replace('_', '-', \strtolower($matches[1]));
 
         if (! isset($options[$option])) {
             return $matches[0];
diff --git a/src/Common/Traits/PhpFileMarkerTrait.php b/src/Common/Traits/PhpFileMarkerTrait.php
@@ -14,7 +14,7 @@ trait PhpFileMarkerTrait
      */
     protected function isFileMarked(string $packageName, string $file): bool
     {
-        return \is_file($file) && \mb_strpos(\file_get_contents($file), \sprintf('/** > %s **/', $packageName)) !== false;
+        return \is_file($file) && \strpos(\file_get_contents($file), \sprintf('/** > %s **/', $packageName)) !== false;
     }
 
     /**
diff --git a/src/Common/Util.php b/src/Common/Util.php
@@ -39,6 +39,6 @@ public static function getComposerJsonFileAndManipulator(): array
      */
     public static function getComposerLockFile(): string
     {
-        return \mb_substr(Factory::getComposerFile(), 0, -4) . 'lock';
+        return \substr(Factory::getComposerFile(), 0, -4) . 'lock';
     }
 }
diff --git a/src/Common/composer.json b/src/Common/composer.json
@@ -24,8 +24,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "ext-mbstring": "*",
+        "php": "^7.1",
         "composer/composer": "^1.6.0 || ^1.7.0"
     },
     "extra": {
diff --git a/src/Security/Audit.php b/src/Security/Audit.php
@@ -200,7 +200,7 @@ private function getLockContents(string $lock): array
                     'version' => $package['version'],
                 ];
 
-                if (isset($package['time']) && false !== \mb_strpos($package['version'], 'dev')) {
+                if (isset($package['time']) && false !== \strpos($package['version'], 'dev')) {
                     $data['time'] = $package['time'];
                 }
 
@@ -248,7 +248,7 @@ private function checkPackageAgainstSecurityAdvisories(
                         $op = null;
 
                         foreach (Constraint::getSupportedOperators() as $operators) {
-                            if (\mb_strpos($version, $operators) === 0) {
+                            if (\strpos($version, $operators) === 0) {
                                 $op = $operators;
 
                                 break;
@@ -261,14 +261,14 @@ private function checkPackageAgainstSecurityAdvisories(
                             continue;
                         }
 
-                        $constraints[] = new Constraint($op, \mb_substr($version, \mb_strlen($op)));
+                        $constraints[] = new Constraint($op, \substr($version, \strlen($op)));
                     }
 
                     $affectedConstraint = new MultiConstraint($constraints);
                     $affectedPackage    = $affectedConstraint->matches(new Constraint('==', $package->getVersion()));
 
                     if ($affectedPackage) {
-                        $composerPackage = \mb_substr($advisoryData['reference'], 11);
+                        $composerPackage = \substr($advisoryData['reference'], 11);
 
                         $vulnerabilities[$composerPackage] = $vulnerabilities[$composerPackage] ?? [
                             'version'    => $package->getPrettyVersion(),
diff --git a/src/Security/Command/Formatter/SimpleFormatter.php b/src/Security/Command/Formatter/SimpleFormatter.php
@@ -15,7 +15,7 @@ public function displayResults(SymfonyStyle $output, array $vulnerabilities): vo
         if (\count($vulnerabilities) !== 0) {
             foreach ($vulnerabilities as $dependency => $issues) {
                 $dependencyFullName = $dependency . ' (' . $issues['version'] . ')';
-                $output->writeln('<info>' . $dependencyFullName . \PHP_EOL . \str_repeat('-', \mb_strlen($dependencyFullName)) . '</>' . \PHP_EOL);
+                $output->writeln('<info>' . $dependencyFullName . \PHP_EOL . \str_repeat('-', \strlen($dependencyFullName)) . '</>' . \PHP_EOL);
 
                 foreach ($issues['advisories'] as $issue => $details) {
                     $output->write(' * ');
diff --git a/src/Security/Downloader/CurlDownloader.php b/src/Security/Downloader/CurlDownloader.php
@@ -45,7 +45,7 @@ public function download(string $url): string
             throw new RuntimeException(\sprintf('An error occurred: %s.', $error));
         }
 
-        $body       = \mb_substr((string) $response, \curl_getinfo($curl, \CURLINFO_HEADER_SIZE));
+        $body       = \substr((string) $response, \curl_getinfo($curl, \CURLINFO_HEADER_SIZE));
         $statusCode = (int) \curl_getinfo($curl, \CURLINFO_HTTP_CODE);
 
         \curl_close($curl);
diff --git a/src/Security/README.md b/src/Security/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Narrowspark Automatic</h1>
 <p align="center">
     <a href="https://github.com/narrowspark/automatic/releases"><img src="https://img.shields.io/packagist/v/narrowspark/automatic.svg?style=flat-square"></a>
-    <a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.2.0-8892BF.svg?style=flat-square"></a>
+    <a href="https://php.net/"><img src="https://img.shields.io/badge/php-%5E7.1.0-8892BF.svg?style=flat-square"></a>
     <a href="https://codecov.io/gh/narrowspark/automatic"><img src="https://img.shields.io/codecov/c/github/narrowspark/automatic/master.svg?style=flat-square"></a>
     <a href="#"><img src="https://img.shields.io/badge/style-level%207-brightgreen.svg?style=flat-square&label=phpstan"></a>
     <a href="http://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square"></a>
diff --git a/src/Security/SecurityPlugin.php b/src/Security/SecurityPlugin.php
@@ -114,7 +114,7 @@ public function activate(Composer $composer, IOInterface $io): void
         // that way, we are sure to use all files from the same version.
         foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__, FilesystemIterator::SKIP_DOTS)) as $file) {
             /** @var \SplFileInfo $file */
-            if (\mb_substr($file->getFilename(), -4) === '.php') {
+            if (\substr($file->getFilename(), -4) === '.php') {
                 require_once $file;
             }
         }
diff --git a/src/Security/Util.php b/src/Security/Util.php
@@ -22,6 +22,6 @@ private function __construct()
      */
     public static function getComposerLockFile(): string
     {
-        return \mb_substr(Factory::getComposerFile(), 0, -4) . 'lock';
+        return \substr(Factory::getComposerFile(), 0, -4) . 'lock';
     }
 }
diff --git a/src/Security/composer.json b/src/Security/composer.json
@@ -25,8 +25,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "ext-mbstring": "*",
+        "php": "^7.1",
         "composer-plugin-api": "^1.0"
     },
     "extra": {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function activate(Composer $composer, IOInterface $io): void`
`201`	`201`	`// that way, we are sure to use all files from the same version.`
`202`	`202`	`foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(\dirname(__DIR__, 1), FilesystemIterator::SKIP_DOTS)) as $file) {`
`203`	`203`	`/** @var \SplFileInfo $file */`
`204`		`- if (\mb_substr($file->getFilename(), -4) === '.php') {`
	`204`	`+ if (\substr($file->getFilename(), -4) === '.php') {`
`205`	`205`	`require_once $file;`
`206`	`206`	`}`
`207`	`207`	`}`
`@@ -743,7 +743,7 @@ public function whatProvides(Pool $pool, $name, $bypassFilters = false)`
`743`	`743`	`}, clone $pool, $pool)();`
`744`	`744`
`745`	`745`	`foreach ($event->getRequest()->getJobs() as $job) {`
`746`		`- if ($job['cmd'] !== 'install' \|\| \mb_strpos($job['packageName'], '/') === false) {`
	`746`	`+ if ($job['cmd'] !== 'install' \|\| \strpos($job['packageName'], '/') === false) {`
`747`	`747`	`continue;`
`748`	`748`	`}`
`749`	`749`
`@@ -756,7 +756,7 @@ public function whatProvides(Pool $pool, $name, $bypassFilters = false)`
`756`	`756`	`foreach ($pool->whatProvides($packageName, $constraint, true) as $package) {`
`757`	`757`	`/** @var \Composer\Package\Link $link */`
`758`	`758`	`foreach (\array_merge($package->getRequires(), $package->getConflicts(), $package->getReplaces()) as $link) {`
`759`		`- if (isset($listed[$link->getTarget()]) \|\| \mb_strpos($link->getTarget(), '/') === false) {`
	`759`	`+ if (isset($listed[$link->getTarget()]) \|\| \strpos($link->getTarget(), '/') === false) {`
`760`	`760`	`continue;`
`761`	`761`	`}`
`762`	`762`
`@@ -838,7 +838,7 @@ private function addLegacyTags(IOInterface $io, array $requires, LegacyTagsManag`
`838`	`838`	`continue;`
`839`	`839`	`}`
`840`	`840`
`841`		`- if (\mb_strpos($name, '/') === false) {`
	`841`	`+ if (\strpos($name, '/') === false) {`
`842`	`842`	`$io->writeError(\sprintf('Constrain [%s] skipped, package name [%s] without a slash is not supported', $version, $name));`
`843`	`843`
`844`	`844`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function hasProvider(string $file): bool`
`73`	`73`	`foreach ($this->legacyTags as $name => $constraint) {`
`74`	`74`	`[$namespace, $packageName] = \explode('/', $name, 2);`
`75`	`75`
`76`		`- if (\mb_strpos($file, \sprintf('provider-%s$', $namespace)) !== false) {`
	`76`	`+ if (\strpos($file, \sprintf('provider-%s$', $namespace)) !== false) {`
`77`	`77`	`return true;`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function get(string $url, $context, ?string $file): array`
`123`	`123`	`} else {`
`124`	`124`	`$headers[] = 'Connection: keep-alive';`
`125`	`125`
`126`		`- if (\mb_strpos($url, 'https://') === 0 && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (\CURL_VERSION_HTTP2 & \curl_version()['features'])) {`
	`126`	`+ if (\strpos($url, 'https://') === 0 && \defined('CURL_VERSION_HTTP2') && \defined('CURL_HTTP_VERSION_2_0') && (\CURL_VERSION_HTTP2 & \curl_version()['features'])) {`
`127`	`127`	`\curl_setopt($ch, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_2_0);`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function download(array &$nextArgs, callable $nextCallback, bool $quiet =`
`176`	`176`	`$this->io->writeError('<warning>Enable the "cURL" PHP extension for faster downloads</warning>');`
`177`	`177`	`}`
`178`	`178`
`179`		`- $note = \DIRECTORY_SEPARATOR === '\\' ? '' : (\mb_stripos(\PHP_OS, 'darwin') !== false ? '🎵' : '🎶');`
	`179`	`+ $note = \DIRECTORY_SEPARATOR === '\\' ? '' : (\stripos(\PHP_OS, 'darwin') !== false ? '🎵' : '🎶');`
`180`	`180`	`$note .= $this->downloader !== null ? (\DIRECTORY_SEPARATOR !== '\\' ? ' 💨' : '') : '';`
`181`	`181`
`182`	`182`	`$this->io->writeError('');`