Skip to content

Commit

Permalink
Merge branch 'release/v0.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
betterthanclay committed Aug 22, 2024
2 parents 4ca1b42 + cbd45c2 commit 358c19d
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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: |
Expand All @@ -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"

Expand All @@ -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"
Expand All @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.6.0 (2024-08-21)
* Converted consts to protected PascalCase
* Updated dependency versions

## v0.5.5 (2024-05-07)
* Updated Tagged dependency

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"php": "^8.1",
"symfony/polyfill-mbstring": "^1.7",

"decodelabs/archetype": "^0.2|^0.3",
"decodelabs/archetype": "^0.3",
"decodelabs/coercion": "^0.2",
"decodelabs/exceptional": "^0.4",
"decodelabs/tagged": "^0.15"
Expand All @@ -36,7 +36,7 @@
},
"extra": {
"branch-alias": {
"dev-develop": "0.5.x-dev"
"dev-develop": "0.6.x-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Metamorph/Handler/HtmlToText.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class HtmlToText implements MacroHandler
{
use MacroHandlerTrait;

public const MACROS = [
protected const Macros = [
'wrap' => [
'wrap' => true
],
Expand Down
2 changes: 1 addition & 1 deletion src/Metamorph/Handler/Markdown.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Markdown implements MacroHandler
use MacroHandlerTrait;
use HtmlTrait;

public const MACROS = [
protected const Macros = [
'safe' => [
'safe' => true
],
Expand Down
2 changes: 1 addition & 1 deletion src/Metamorph/Handler/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Text implements MacroHandler
{
use MacroHandlerTrait;

public const MACROS = [
protected const Macros = [
'raw' => [
'wrap' => false
],
Expand Down
8 changes: 4 additions & 4 deletions src/Metamorph/MacroHandlerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

trait MacroHandlerTrait
{
//const MACROS = [];
//protected const Macros = [];

/**
* Load macro options
Expand All @@ -22,12 +22,12 @@ public static function loadMacro(
string $name
): ?array {
if (
!isset(static::MACROS[$name]) ||
!is_array(static::MACROS[$name])
!isset(static::Macros[$name]) ||
!is_array(static::Macros[$name])
) {
return null;
}

return static::MACROS[$name];
return static::Macros[$name];
}
}

0 comments on commit 358c19d

Please sign in to comment.