Merge branch 'cleanup'

Author: lkrms

lk-util/Command/Generate/Concept/GenerateCommand.php

@@ -881,7 +881,7 @@ protected function handleOutput($lines): void
             $this->OutputFile = $file;
 
             if (file_exists($file)) {
-                $input = file_get_contents($file);
+                $input = File::getContents($file);
                 if ($input === $output) {
                     Console::log('Nothing to do:', $file);
                     return;
@@ -916,7 +916,7 @@ protected function handleOutput($lines): void
             Console::info($verb, $file);
         }
 
-        file_put_contents($file, $output);
+        File::putContents($file, $output);
     }
 
     /**

scripts/generate.php

@@ -184,7 +184,7 @@ function generated($commandOrFile): void
     generated($generateEntity);
     if ($save && $generateEntity->Entity !== null) {
         File::createDir(dirname($file));
-        file_put_contents($file, Json::prettyPrint($generateEntity->Entity));
+        File::putContents($file, Json::prettyPrint($generateEntity->Entity));
         generated($file);
     }
 }
@@ -206,14 +206,14 @@ function generated($commandOrFile): void
 }
 sort($attributes);
 $attributes = implode(\PHP_EOL, $attributes) . \PHP_EOL;
-if (file_get_contents($file) !== $attributes) {
+if (File::getContents($file) !== $attributes) {
     if (in_array('--check', $args)) {
         Console::info('Would replace', $file);
         Console::count(Level::ERROR);
         $status |= 1;
     } else {
         Console::info('Replacing', $file);
-        file_put_contents($file, $attributes);
+        File::putContents($file, $attributes);
     }
 } else {
     Console::log('Nothing to do:', $file);

src/Toolkit/Core/Catalog/Char.php

@@ -7,13 +7,15 @@
 /**
  * Character sequences
  *
+ * @api
+ *
  * @extends AbstractDictionary<string>
  */
 final class Char extends AbstractDictionary
 {
-    public const ALPHABETIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    public const ALPHABETIC_LOWER = 'abcdefghijklmnopqrstuvwxyz';
-    public const ALPHABETIC_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    public const ALPHA = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    public const LOWER = 'abcdefghijklmnopqrstuvwxyz';
+    public const UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     public const NUMERIC = '0123456789';
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
 }

src/Toolkit/Core/Catalog/FileDescriptor.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Salient\Core\Catalog;
+
+use Salient\Core\AbstractEnumeration;
+
+/**
+ * File descriptors
+ *
+ * @api
+ *
+ * @extends AbstractEnumeration<int>
+ */
+final class FileDescriptor extends AbstractEnumeration
+{
+    public const IN = 0;
+    public const OUT = 1;
+    public const ERR = 2;
+}

src/Toolkit/Core/Catalog/ProcessState.php

@@ -192,24 +192,4 @@ final class Regex extends AbstractDictionary
           (?: \s* (?: \| | & ) (?&sp)* (?-1) )?
         )
         REGEX;
-
-    public static function delimit(
-        string $regex,
-        string $delimiter = '/'
-    ): string {
-        return $delimiter
-            . str_replace($delimiter, '\\' . $delimiter, $regex)
-            . $delimiter;
-    }
-
-    public static function anchorAndDelimit(
-        string $regex,
-        string $delimiter = '/'
-    ): string {
-        return $delimiter
-            . '^'
-            . str_replace($delimiter, '\\' . $delimiter, $regex)
-            . '$'
-            . $delimiter;
-    }
 }

src/Toolkit/Core/Catalog/ProcessStream.php

@@ -4,4 +4,7 @@
 
 use Salient\Core\AbstractException;
 
+/**
+ * @api
+ */
 class ProcessException extends AbstractException {}

src/Toolkit/Core/Catalog/Regex.php

@@ -2,4 +2,7 @@
 
 namespace Salient\Core\Exception;
 
+/**
+ * @api
+ */
 class ProcessTimedOutException extends ProcessException {}