Merge branch 'cleanup'

Author: lkrms

src/Console/ConsoleFormatter.php

@@ -92,7 +92,7 @@ final class ConsoleFormatter
             # empty line by making the subsequent newline conditional on inblock
             (?<block> (?> (?<inblock> (?: (?! (?&endofblock) ) (?: \k<indent> | (?= (?&endofline) ) ) [^\n]* (?: (?= \n (?&endofblock) ) | \n | \z ) )+ )? ) )
             # Allow code fences to terminate at the end of the subject
-            (?: (?(inblock) \n ) (?&endofblock) | \z )
+            (?: (?(inblock) \n ) (?&endofblock) | \z ) | \z
           ) ) |
           # CommonMark-compliant code spans
           (?<backtickstring> (?> `+ ) ) (?<span> (?> (?: [^`]+ | (?! (?&endofspan) ) `+ )* ) ) (?&endofspan) |
@@ -330,7 +330,11 @@ public function formatTags(
             $indent = (string) $match['indent'];
 
             if ($match['breaks'] !== null) {
-                $string .= $indent . $match['breaks'];
+                $breaks = $match['breaks'];
+                if ($unwrap && strpos($breaks, "\n") !== false) {
+                    $breaks = Convert::unwrap($breaks, "\n", false, true, true);
+                }
+                $string .= $indent . $breaks;
                 continue;
             }
 

src/Container/Application.php

@@ -367,7 +367,15 @@ final public function getBasePath(): string
     /**
      * @inheritDoc
      */
-    public function restoreWorkingDirectory()
+    final public function getWorkingDirectory(): string
+    {
+        return $this->WorkingDirectory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    final public function restoreWorkingDirectory()
     {
         if (File::cwd() !== $this->WorkingDirectory) {
             File::chdir($this->WorkingDirectory);
@@ -379,7 +387,7 @@ public function restoreWorkingDirectory()
     /**
      * @inheritDoc
      */
-    public function setWorkingDirectory(?string $directory = null)
+    final public function setWorkingDirectory(?string $directory = null)
     {
         $this->WorkingDirectory = $directory ?? File::cwd();
 

src/Container/ApplicationInterface.php

@@ -167,13 +167,18 @@ public function syncNamespace(
     );
 
     /**
-     * Change to the application's working directory
+     * Get the application's working directory
      *
      * The application's working directory is either:
      *
      * - the directory in which it was started, or
      * - the directory most recently set by calling
      *   {@see ApplicationInterface::setWorkingDirectory()}
+     */
+    public function getWorkingDirectory(): string;
+
+    /**
+     * Change to the application's working directory
      *
      * @return $this
      */

src/Utility/Test.php

@@ -51,7 +51,7 @@ public static function isIntValue($value): bool
     public static function isFloatValue($value): bool
     {
         return is_float($value) ||
-            (is_string($value) && is_numeric($value) && !self::isIntValue($value));
+            (is_string($value) && is_numeric(trim($value)) && !self::isIntValue($value));
     }
 
     /**

tests/unit/Console/ConsoleFormatterTest.php

@@ -521,6 +521,22 @@ public static function formatProvider(): array
                 false,
                 "\n  ",
             ],
+            [
+                <<<EOF
+                text without backticks at the end of the line
+
+                text with `backticks` at the end of the line
+                EOF,
+                $loopback,
+                <<<EOF
+                text without backticks
+                at the end of the line
+
+                text with `backticks`
+                at the end of the line
+                EOF,
+                true,
+            ],
         ];
     }