Merge remote-tracking branch 'origin/dev' into wpstarter-next

Author: nlemoine

docs/02-Environment-Variables.md

@@ -64,7 +64,7 @@ By convention those files are often named `.env`.
 
 ## PHP and env vars
 
-In PHP there are two functions: [`getevn`](http://php.net/manual/en/function.getenv.php) and [`putenv`](http://php.net/manual/en/function.getenv.php) that allow to, respectively, read and write env vars on the server in an OS-agnostic way.
+In PHP there are two functions: [`getenv`](http://php.net/manual/en/function.getenv.php) and [`putenv`](http://php.net/manual/en/function.getenv.php) that allow to, respectively, read and write env vars on the server in an OS-agnostic way.
 
 There's nothing in PHP core that parse env files, but is no surprise that there are different libraries to do that.
 
@@ -159,7 +159,7 @@ WP Starter supports an environment variable called `WP_STARTER_ENV_TO_CONST` con
 WP_STARTER_ENV_TO_CONST="AWESOME_PLUGIN_CONFIG,ANOTHER_VAR,YET_ANOTHER"
 ```
 
-With such env variable set, WP Start will declare constants for the three env variables.
+With such env variable set, WP Starter will declare constants for the three env variables.
 
 Please note that env variables are always strings, while PHP constants can be any static type. For WordPress constants that is not an issue because WP Starter knows the expected type can cast the value before define the constant. For custom variables a different type can be specified using the `NAME:TYPE` syntax . For example:
 

docs/03-WordPress-Integration.md

@@ -74,7 +74,7 @@ WP Starter provides an option to register default themes shipped with core packa
 
 There's also the `move-content` option that when set to `true` tells WP Starter to moves the entire `wp-content` folder shipped with a WordPress package into the project's content folder.
 
-If there's no interest in default plugin/themes, the suggested approach is to use the [Root's package]((https://roots.io/)), [wp-downloader](https://github.com/wecodemore/wp-downloader), or a custom package that points to a "*no-content*" WordPress distribution.
+If there's no interest in default plugin/themes, the suggested approach is to use the [Root's package](https://roots.io/), [wp-downloader](https://github.com/wecodemore/wp-downloader), or a custom package that points to a "*no-content*" WordPress distribution.
 
 
 

src/Config/Result.php

@@ -90,7 +90,7 @@ public static function promise(callable $provider): Result
      *
      * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration.IncorrectVoidReturn
      */
-    private function __construct($value = null, \Throwable $error = null)
+    private function __construct($value = null, ?\Throwable $error = null)
     {
         // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration.IncorrectVoidReturn
         if ($value instanceof Result) {

src/Env/WordPressEnvBridge.php

@@ -347,7 +347,7 @@ public static function loadedVars(): array
     /**
      * @param Dotenv|null $dotenv
      */
-    public function __construct(Dotenv $dotenv = null)
+    public function __construct(?Dotenv $dotenv = null)
     {
         $this->dotenv = $dotenv;
     }

src/Util/WpVersion.php

@@ -67,7 +67,7 @@ public static function normalize(string $version): string
     public function __construct(
         PackageFinder $packageFinder,
         Io $io,
-        string $fallbackVersion = null
+        ?string $fallbackVersion = null
     ) {
 
         $this->packageFinder = $packageFinder;

tests/integration/Cli/PhpToolProcessFactoryTest.php

@@ -215,7 +215,7 @@ private function assertProcessWorks(PhpToolProcess $process): void
      * @return PhpToolProcessFactory
      */
     private function factoryPhpToolProcessFactory(
-        UrlDownloader $urlDownloader = null
+        ?UrlDownloader $urlDownloader = null
     ): PhpToolProcessFactory {
 
         $composer = $this->factoryComposer();

tests/integration/Cli/WpCliToolTest.php

@@ -151,7 +151,7 @@ public function testCheckPharError(): void
      * @param string|null $cwd
      * @return WpCliTool
      */
-    private function factoryTool(string $cwd = null): WpCliTool
+    private function factoryTool(?string $cwd = null): WpCliTool
     {
         return new WpCliTool(
             new Config(

tests/src/IntegrationTestCase.php

@@ -142,7 +142,7 @@ protected function factoryComposerIo(
      * @return Paths
      */
     protected function factoryPaths(
-        string $cwd = null,
+        ?string $cwd = null,
         int $verbosity = OutputInterface::VERBOSITY_NORMAL,
         string $input = '',
         array $extra = []
@@ -171,7 +171,7 @@ protected function factoryPaths(
     protected function factoryComposerConfig(
         string $input = '',
         int $verbosity = OutputInterface::VERBOSITY_NORMAL,
-        string $cwd = null
+        ?string $cwd = null
     ): Composer\Config {
 
         return Composer\Factory::createConfig(
@@ -194,7 +194,7 @@ protected function factoryComposer(): Composer\Composer
      * @param string $cwd
      * @return SystemProcess
      */
-    protected function factorySystemProcess(string $cwd = null): SystemProcess
+    protected function factorySystemProcess(?string $cwd = null): SystemProcess
     {
         return new SystemProcess(
             $this->factoryPaths($cwd),
@@ -206,7 +206,7 @@ protected function factorySystemProcess(string $cwd = null): SystemProcess
      * @param string $cwd
      * @return PhpProcess
      */
-    protected function factoryPhpProcess(string $cwd = null): PhpProcess
+    protected function factoryPhpProcess(?string $cwd = null): PhpProcess
     {
         $php = (new PhpExecutableFinder())->find() ?: 'php';
 

tests/src/TestCase.php

@@ -154,7 +154,7 @@ protected function factoryLocator(...$objects): Util\Locator
      * @param array|null $extra
      * @return Util\Paths
      */
-    protected function factoryPaths(array $extra = null): Util\Paths
+    protected function factoryPaths(?array $extra = null): Util\Paths
     {
         $root = $this->fixturesPath() . '/paths-root';
 

tests/unit/Util/RequirementsTest.php

@@ -175,7 +175,7 @@ public function testConfigsLoadedFromDefaultFileAreMerged(): void
      * @param string $customRoot
      * @return mixed
      */
-    private function executeExtractConfig(array $extra, string $customRoot = null): array
+    private function executeExtractConfig(array $extra, ?string $customRoot = null): array
     {
         $tester = \Closure::bind(
             function (string $rootPath) use ($extra): array {