Merge branch 'release/v0.4.6'

decodelabs · Aug 21, 2024 · ec63381 · ec63381
2 parents 2583222 + 59e5487
commit ec63381
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,4 +8,3 @@ phpstan.neon export-ignore
 phpunit.xml.dist export-ignore
 docs/ export-ignore
 tests/ export-ignore
-stubs/ export-ignore
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -24,15 +24,15 @@ jobs:
           ini-values: "post_max_size=256M"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: Install Effigy
         run: |
           composer global config --no-plugins allow-plugins.phpstan/extension-installer true
           composer global require decodelabs/effigy
 
       - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
@@ -72,7 +72,7 @@ jobs:
           ini-values: "post_max_size=256M"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: Install Effigy
         run: |
@@ -83,7 +83,7 @@ jobs:
         run: "composer validate --strict"
 
       - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
@@ -106,7 +106,7 @@ jobs:
           ini-values: "post_max_size=256M"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Check EditorConfig configuration"
         run: "test -f .editorconfig"
@@ -120,7 +120,7 @@ jobs:
           composer global require decodelabs/effigy
 
       - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-## v0.4.5 (2024-03-34)
+## v0.4.6 (2024-08-21)
+* Converted consts to protected PascalCase
+
+## v0.4.5 (2024-03-24)
 * Use Wellspring for the Autoloader
 * Made PHP8.1 minimum version
 

diff --git a/ecs.php b/ecs.php
@@ -5,9 +5,12 @@
 declare(strict_types=1);
 
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return static function (ECSConfig $ecsConfig): void {
-    $ecsConfig->paths([__DIR__ . '/src']);
-    $ecsConfig->sets([SetList::CLEAN_CODE, SetList::PSR_12]);
-};
+return ECSConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src'
+    ])
+    ->withPreparedSets(
+        cleanCode: true,
+        psr12: true
+    );
diff --git a/src/Exceptional/Factory.php b/src/Exceptional/Factory.php
@@ -11,7 +11,6 @@
 
 use DecodeLabs\Coercion;
 use DecodeLabs\Exceptional\Exception as ExceptionInterface;
-
 use Exception as RootException;
 use InvalidArgumentException;
 use LogicException;
@@ -23,7 +22,7 @@
  */
 class Factory
 {
-    public const STANDARD = [
+    protected const Standard = [
         'Logic' => [
             'type' => 'LogicException'
         ],
@@ -137,7 +136,7 @@ class Factory
     ];
 
 
-    public const REWIND = 2;
+    protected const Rewind = 2;
 
     /**
      * @var array<Exception>
@@ -147,7 +146,7 @@ class Factory
     protected ?string $message = null;
 
     /**
-     * @var array<string, mixed>
+     * @var array<string,mixed>
      */
     protected array $params = [];
 
@@ -270,8 +269,8 @@ protected function __construct(
             0
         );
 
-        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, (int)($rewind + static::REWIND + 1));
-        $key = $rewind + static::REWIND;
+        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, (int)($rewind + static::Rewind + 1));
+        $key = $rewind + static::Rewind;
         $lastTrace = $trace[$key - 1];
 
         $this->params['file'] = $file ?? $params['file'] ?? $lastTrace['file'] ?? null;
@@ -575,7 +574,7 @@ protected function indexInterface(
 
 
         // Package
-        if (isset(static::STANDARD[$name])) {
+        if (isset(static::Standard[$name])) {
             $this->indexPackageInterface($name);
 
             // Interface
@@ -649,7 +648,7 @@ interface_exists($interface)
     protected function indexPackageInterface(
         string $name
     ): void {
-        $standard = static::STANDARD[$name];
+        $standard = static::Standard[$name];
         $prefix = '\\DecodeLabs\\Exceptional\\';
         $interface = $prefix . $name . 'Exception';