Ran php-cs-fixer

Author: Sebb767

scripts/ReleaseUpdater.php

@@ -60,32 +60,32 @@ public function __construct(string $changelogPath, string $composerConfigPath, s
 
     public function updateChangelog(string $version)
     {
-        $content = \file_get_contents($this->changelogPath);
+        $content = file_get_contents($this->changelogPath);
 
-        $pendingChangesStart = \mb_strpos($content, self::PENDING_CHANGES_START);
-        $pendingChangesEnd = \mb_strpos($content, self::PENDING_CHANGES_END);
+        $pendingChangesStart = mb_strpos($content, self::PENDING_CHANGES_START);
+        $pendingChangesEnd = mb_strpos($content, self::PENDING_CHANGES_END);
 
-        if (\false === $pendingChangesStart || \false === $pendingChangesEnd) {
+        if (false === $pendingChangesStart || false === $pendingChangesEnd) {
             throw new Exception('ERROR: Cannot reliably determine the changelog section to edit, aborting.');
         }
 
         $changelog = $this->createUpdatedChangelog($version, $content, $pendingChangesStart, $pendingChangesEnd);
 
-        \file_put_contents($this->changelogPath, $changelog);
+        file_put_contents($this->changelogPath, $changelog);
     }
 
     private function createUpdatedChangelog(string $version, string $content, int $contentStart, int $contentEnd): string
     {
-        $extractFrom = $contentStart + \mb_strlen(self::PENDING_CHANGES_START);
-        $extractLength = $contentEnd - $contentStart - \mb_strlen(self::PENDING_CHANGES_START);
+        $extractFrom = $contentStart + mb_strlen(self::PENDING_CHANGES_START);
+        $extractLength = $contentEnd - $contentStart - mb_strlen(self::PENDING_CHANGES_START);
 
-        $newReleaseChanges = \trim(\mb_substr($content, $extractFrom, $extractLength));
+        $newReleaseChanges = trim(mb_substr($content, $extractFrom, $extractLength));
 
-        $changelogStart = \trim(\mb_substr($content, 0, $contentStart));
-        $changelogEnd = \trim(\mb_substr($content, $contentEnd + \mb_strlen(self::PENDING_CHANGES_END)));
+        $changelogStart = trim(mb_substr($content, 0, $contentStart));
+        $changelogEnd = trim(mb_substr($content, $contentEnd + mb_strlen(self::PENDING_CHANGES_END)));
 
-        $unreleasedLineStart = \mb_strpos($changelogStart, '## [Unreleased]');
-        $changelogStart = \trim(\mb_substr($changelogStart, 0, $unreleasedLineStart));
+        $unreleasedLineStart = mb_strpos($changelogStart, '## [Unreleased]');
+        $changelogStart = trim(mb_substr($changelogStart, 0, $unreleasedLineStart));
 
         $changelogTemplate = '[START]
 
@@ -102,22 +102,22 @@ private function createUpdatedChangelog(string $version, string $content, int $c
 [END]
 ';
 
-        $tempPath = \tempnam(\sys_get_temp_dir(), 'changelog-');
-        \file_put_contents($tempPath, $newReleaseChanges);
-        \system('pbcopy < '.$tempPath);
+        $tempPath = tempnam(sys_get_temp_dir(), 'changelog-');
+        file_put_contents($tempPath, $newReleaseChanges);
+        system('pbcopy < '.$tempPath);
 
-        return \strtr($changelogTemplate, [
+        return strtr($changelogTemplate, [
             '[START]' => $changelogStart,
-            '[UNRELEASED_HEADER]' => \sprintf(self::UNRELEASED_CHANGES_HEADER, $this->githubUrl, $version),
+            '[UNRELEASED_HEADER]' => sprintf(self::UNRELEASED_CHANGES_HEADER, $this->githubUrl, $version),
             '[PENDING_CHANGES_START]' => self::PENDING_CHANGES_START,
             '[PENDING_CHANGES_PLACEHOLDER]' => self::PENDING_CHANGES_PLACEHOLDER,
             '[PENDING_CHANGES_END]' => self::PENDING_CHANGES_END,
-            '[NEW_RELEASE_HEADER]' => \sprintf(
+            '[NEW_RELEASE_HEADER]' => sprintf(
                 self::NEW_RELEASE_HEADER,
                 $version,
                 $this->githubUrl,
                 $version,
-                \date('Y-m-d')
+                date('Y-m-d')
             ),
             '[NEW_RELEASE_CHANGES]' => $newReleaseChanges,
             '[END]' => $changelogEnd,
@@ -126,14 +126,14 @@ private function createUpdatedChangelog(string $version, string $content, int $c
 
     public function updateComposerAliasVersion(string $composerAliasVersion)
     {
-        $json = \file_get_contents($this->composerConfigPath);
-        $contents = \json_decode($json, \true);
+        $json = file_get_contents($this->composerConfigPath);
+        $contents = json_decode($json, true);
 
         $contents['extra']['branch-alias']['dev-master'] = $composerAliasVersion.'-dev';
 
-        \file_put_contents(
+        file_put_contents(
             $this->composerConfigPath,
-            \json_encode($contents, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)."\n"
+            json_encode($contents, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)."\n"
         );
     }
 }

scripts/TestCase.php

@@ -12,8 +12,10 @@
 namespace Contentful\Tests;
 
 use Contentful\Core\Api\Link;
+
 use function GuzzleHttp\json_decode as guzzle_json_decode;
 use function GuzzleHttp\json_encode as guzzle_json_encode;
+
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
 /**
@@ -34,7 +36,7 @@ class TestCase extends BaseTestCase
      */
     protected function markTestAsPassed()
     {
-        $this->assertTrue(\true, 'Test case did not throw an exception and passed.');
+        $this->assertTrue(true, 'Test case did not throw an exception and passed.');
     }
 
     /**
@@ -53,7 +55,7 @@ protected function assertLink(string $id, string $linkType, Link $link, string $
      */
     protected function assertJsonFixtureEqualsJsonObject(string $file, $object, string $message = '')
     {
-        $dir = $this->convertClassToFixturePath(\debug_backtrace()[1]['class']);
+        $dir = $this->convertClassToFixturePath(debug_backtrace()[1]['class']);
 
         $this->assertJsonStringEqualsJsonFile($dir.'/'.$file, guzzle_json_encode($object), $message);
     }
@@ -63,16 +65,13 @@ protected function assertJsonFixtureEqualsJsonObject(string $file, $object, stri
      */
     protected function assertJsonFixtureEqualsJsonString(string $file, string $string, string $message = '')
     {
-        $dir = $this->convertClassToFixturePath(\debug_backtrace()[1]['class']);
+        $dir = $this->convertClassToFixturePath(debug_backtrace()[1]['class']);
 
         $this->assertJsonStringEqualsJsonFile($dir.'/'.$file, $string, $message);
     }
 
     /**
      * Asserts that any two variables will be serialized to the same JSON structure.
-     *
-     * @param $expected
-     * @param $object
      */
     protected function assertJsonStructuresAreEqual($expected, $object, string $message = '')
     {
@@ -85,24 +84,24 @@ protected function assertJsonStructuresAreEqual($expected, $object, string $mess
 
     protected function getFixtureContent(string $file): string
     {
-        $dir = $this->convertClassToFixturePath(\debug_backtrace()[1]['class']);
+        $dir = $this->convertClassToFixturePath(debug_backtrace()[1]['class']);
 
-        return \file_get_contents($dir.'/'.$file);
+        return file_get_contents($dir.'/'.$file);
     }
 
     /**
      * @return array|null
      */
     protected function getParsedFixture(string $file)
     {
-        $dir = $this->convertClassToFixturePath(\debug_backtrace()[1]['class']);
+        $dir = $this->convertClassToFixturePath(debug_backtrace()[1]['class']);
 
-        return guzzle_json_decode(\file_get_contents($dir.'/'.$file), \true);
+        return guzzle_json_decode(file_get_contents($dir.'/'.$file), true);
     }
 
     protected function getTestFixturesPath(): string
     {
-        return $this->convertClassToFixturePath(\debug_backtrace()[1]['class']);
+        return $this->convertClassToFixturePath(debug_backtrace()[1]['class']);
     }
 
     /**
@@ -118,17 +117,17 @@ protected function convertClassToFixturePath(string $class): string
         }
 
         // Removes the initial common namespace prefix
-        $extractedClass = \str_replace('Contentful\\Tests\\', '', $class);
+        $extractedClass = str_replace('Contentful\\Tests\\', '', $class);
         // Removes the initial library specific prefix (Core, Delivery, Management, etc)
-        $extractedClass = \mb_substr($extractedClass, \mb_strpos($extractedClass, '\\') + 1);
+        $extractedClass = mb_substr($extractedClass, mb_strpos($extractedClass, '\\') + 1);
         // Converts the namespace separator to the directory separator, as defined in PSR-4
-        $extractedClass = \str_replace('\\', \DIRECTORY_SEPARATOR, $extractedClass);
+        $extractedClass = str_replace('\\', \DIRECTORY_SEPARATOR, $extractedClass);
         // Removes the "Test" suffix from the class name
-        $extractedClass = \mb_substr($extractedClass, 0, -4);
+        $extractedClass = mb_substr($extractedClass, 0, -4);
 
         // Uses the path of the class to determine the starting point of the tests
         $reflection = new \ReflectionClass($class);
-        $testsPath = \str_replace($extractedClass.'Test.php', '', $reflection->getFileName());
+        $testsPath = str_replace($extractedClass.'Test.php', '', $reflection->getFileName());
 
         return self::$classMap[$class] = $testsPath.'/Fixtures/'.$extractedClass;
     }

scripts/create-redirector.php

@@ -9,33 +9,33 @@
 
 declare(strict_types=1);
 
-$travisRepoSlug = \getenv('TRAVIS_REPO_SLUG');
+$travisRepoSlug = getenv('TRAVIS_REPO_SLUG');
 $indexFile = $argv[1];
 
-$shellOutput = \shell_exec('git tag');
-$tags = \explode("\n", $shellOutput);
-$tags = \array_filter($tags, function ($tag) {
-    return '' !== \trim($tag);
+$shellOutput = shell_exec('git tag');
+$tags = explode("\n", $shellOutput);
+$tags = array_filter($tags, function ($tag) {
+    return '' !== trim($tag);
 });
 
 // We remove all non-stable versions from the list as we don't want to direct the docs to them by default
-$tags = \array_filter($tags, function ($tag) {
-    return false === \mb_strpos($tag, '-');
+$tags = array_filter($tags, function ($tag) {
+    return false === mb_strpos($tag, '-');
 });
 
-\usort($tags, function ($a, $b) {
-    return \version_compare($b, $a);
+usort($tags, function ($a, $b) {
+    return version_compare($b, $a);
 });
 
 $tags[] = 'master';
 
 $newestTag = $tags[0];
-$repoParts = \explode('/', $travisRepoSlug);
+$repoParts = explode('/', $travisRepoSlug);
 $repoOwner = $repoParts[0];
 $repoName = $repoParts[1];
 
 $html = '<meta http-equiv="refresh" content="0; url=https://'.$repoOwner.'.github.io/'.$repoName.'/api/'.$newestTag.'" />';
 
-\file_put_contents($indexFile, $html);
+file_put_contents($indexFile, $html);
 
 echo 'Created index file redirecting to '.$newestTag.'.'."\n";

scripts/php-cs-fixer.php

@@ -13,7 +13,7 @@
 use PhpCsFixer\Finder;
 
 return function (string $packageName, bool $usePhp7, array $directories, array $exclude = []): Config {
-    $year = \date('Y');
+    $year = date('Y');
 
     $fileHeaderComment = <<<COMMENT
         This file is part of the contentful/$packageName package.
@@ -76,7 +76,7 @@
         $rules['ternary_to_null_coalescing'] = true;
     }
 
-    $cache = \tempnam(\sys_get_temp_dir(), $packageName).'-php_cs.cache';
+    $cache = tempnam(sys_get_temp_dir(), $packageName).'-php_cs.cache';
 
     return (new Config())
         ->setFinder($finder)

scripts/release.php

@@ -28,29 +28,29 @@ function message(string $message = '')
 
 $version = $argv[1];
 $pattern = '/^(?<version>[0-9]+\.[0-9]+\.[0-9]+)(?<prerelease>-[0-9a-zA-Z.]+)?(?<build>\+[0-9a-zA-Z.]+)?$/';
-if (!\preg_match($pattern, $version)) {
+if (!preg_match($pattern, $version)) {
     exit_message('ERROR: Provided version is not a valid semver identifier, aborting.', 1);
 }
 
-$composerAliasVersion = \null;
+$composerAliasVersion = null;
 if (isset($argv[2])) {
     $composerAliasVersion = $argv[2];
     $pattern = '/^(?<version>[0-9]+\.[0-9]+\.[0-9]+)$/';
-    if (!\preg_match($pattern, $composerAliasVersion)) {
+    if (!preg_match($pattern, $composerAliasVersion)) {
         exit_message('ERROR: Provided master alias version is not a valid semver identifier, aborting.', 1);
     }
 }
 
-$changelogPath = \getcwd().'/CHANGELOG.md';
-$composerConfigPath = \getcwd().'/composer.json';
-$url = \shell_exec('git remote get-url origin');
-$url = \str_replace('github.com:', 'github.com/', $url);
-$url = 'https://'.\mb_substr($url, 4, -5);
+$changelogPath = getcwd().'/CHANGELOG.md';
+$composerConfigPath = getcwd().'/composer.json';
+$url = shell_exec('git remote get-url origin');
+$url = str_replace('github.com:', 'github.com/', $url);
+$url = 'https://'.mb_substr($url, 4, -5);
 
 try {
     $updater = new ReleaseUpdater($changelogPath, $composerConfigPath, $url);
     $updater->updateChangelog($version);
-    if (\null !== $composerAliasVersion) {
+    if (null !== $composerAliasVersion) {
         $updater->updateComposerAliasVersion($composerAliasVersion);
     }
 } catch (\Exception $exception) {
@@ -59,20 +59,20 @@ function message(string $message = '')
 
 message();
 message('Committing changes to changelog');
-\system('git add '.$changelogPath);
-\shell_exec('git commit --message="chore(release): Prepare version '.$version.'"');
+system('git add '.$changelogPath);
+shell_exec('git commit --message="chore(release): Prepare version '.$version.'"');
 message('Changes committed!');
 message();
 
 message('Creating git tag');
-\shell_exec('git tag --sign '.$version.' --message="'.$version.'"');
+shell_exec('git tag --sign '.$version.' --message="'.$version.'"');
 message('Tag created!');
 message();
 
-if (\null !== $composerAliasVersion) {
+if (null !== $composerAliasVersion) {
     message('Committing changes to composer.json');
-    \shell_exec('git add '.$composerConfigPath);
-    \shell_exec('git commit --message="chore(release): Prepare development of next version"');
+    shell_exec('git add '.$composerConfigPath);
+    shell_exec('git commit --message="chore(release): Prepare development of next version"');
     message('Changes committed!');
     message();
 }

src/Api/BaseClient.php

@@ -75,8 +75,8 @@ public function __construct(
             $this->getExceptionNamespace()
         );
 
-        if ('/' === \mb_substr($host, -1)) {
-            $host = \mb_substr($host, 0, -1);
+        if ('/' === mb_substr($host, -1)) {
+            $host = mb_substr($host, 0, -1);
         }
         $this->host = $host;
 
@@ -126,7 +126,7 @@ protected function callApi(string $method, string $uri, array $options = []): ar
      */
     private function logMessage(Message $message)
     {
-        $logMessage = \sprintf(
+        $logMessage = sprintf(
             '%s %s (%.3Fs)',
             $message->getRequest()->getMethod(),
             (string) $message->getRequest()->getUri(),
@@ -153,7 +153,7 @@ private function parseResponse(ResponseInterface $response = null)
             : null;
 
         return $body
-            ? \json_decode($body, true)
+            ? json_decode($body, true)
             : [];
     }
 
@@ -257,8 +257,8 @@ protected static function getVersionForPackage(string $package): string
             ;
 
             // Removes the ".x-dev" part which is inserted during development
-            if ('.x-dev' === \mb_substr($shortVersion, -6)) {
-                $shortVersion = \mb_substr($shortVersion, 0, -6).'-dev';
+            if ('.x-dev' === mb_substr($shortVersion, -6)) {
+                $shortVersion = mb_substr($shortVersion, 0, -6).'-dev';
             }
 
             return $shortVersion;