diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index fdb8dc7..096711d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -41,4 +41,4 @@ jobs:
run: XDEBUG_MODE=coverage bin/phpspec run -f progress -c phpspec-coverage.yml
- name: Run behat tests
- run: ./bin/behat
+ run: ./bin/behat --snippets-for
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26569f3..57bf2b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+### Removed
+* upgrade psalm error level to 2
+
### Removed
* CircleCI configuration for CI
diff --git a/README.md b/README.md
index a3a1339..042a5b8 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ use PUGX\Poser\Render\SvgPlasticRender;
use PUGX\Poser\Poser;
$render = new SvgPlasticRender();
-$poser = new Poser($render);
+$poser = new Poser([$render]);
echo $poser->generate('license', 'MIT', '428F7E', 'plastic');
// or
diff --git a/composer.json b/composer.json
index 6e8aa3e..15ee2a7 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
"php-cs-fixer": "bin/php-cs-fixer fix -v --ansi",
"phpspec": "bin/phpspec run --format=pretty --ansi",
"phpspec-coverage": "bin/phpspec run -f progress -c phpspec-coverage.yml --ansi",
- "behat": "bin/behat",
+ "behat": "bin/behat --snippets-for",
"docker:build:php74": "docker build -t pugx/poser:php74 -f .docker/base/php74/Dockerfile .",
"docker:push:php74": "docker push pugx/poser:php74",
"docker:build:php80": "docker build -t pugx/poser:php80 -f .docker/base/php80/Dockerfile .",
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
index 0f2fc9d..8d4822f 100644
--- a/features/bootstrap/FeatureContext.php
+++ b/features/bootstrap/FeatureContext.php
@@ -1,11 +1,11 @@
+
diff --git a/spec/PUGX/Poser/PoserSpec.php b/spec/PUGX/Poser/PoserSpec.php
index d3bf7bb..cbf84fb 100644
--- a/spec/PUGX/Poser/PoserSpec.php
+++ b/spec/PUGX/Poser/PoserSpec.php
@@ -89,7 +89,7 @@ public function getMatchers(): array
$regex = '/^$/';
$matches = [];
- return \preg_match($regex, $object, $matches, PREG_OFFSET_CAPTURE, 0);
+ return \preg_match($regex, $object, $matches, \PREG_OFFSET_CAPTURE, 0);
},
];
}
diff --git a/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php b/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
index d3460bf..940b9f6 100644
--- a/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
@@ -29,7 +29,7 @@ public function getMatchers(): array
$regex = '/^$/';
$matches = [];
- return \preg_match($regex, (string) $subject, $matches, PREG_OFFSET_CAPTURE, 0);
+ return \preg_match($regex, (string) $subject, $matches, \PREG_OFFSET_CAPTURE, 0);
},
];
}
diff --git a/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php b/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
index a141505..bb6fc3c 100644
--- a/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
@@ -29,7 +29,7 @@ public function getMatchers(): array
$regex = '/^$/';
$matches = [];
- return \preg_match($regex, (string) $subject, $matches, PREG_OFFSET_CAPTURE, 0);
+ return \preg_match($regex, (string) $subject, $matches, \PREG_OFFSET_CAPTURE, 0);
},
];
}
diff --git a/spec/PUGX/Poser/Render/SvgPlasticRenderSpec.php b/spec/PUGX/Poser/Render/SvgPlasticRenderSpec.php
index 9285b3f..cfdf3a2 100644
--- a/spec/PUGX/Poser/Render/SvgPlasticRenderSpec.php
+++ b/spec/PUGX/Poser/Render/SvgPlasticRenderSpec.php
@@ -45,7 +45,7 @@ public function getMatchers(): array
$regex = '/^$/';
$matches = [];
- return \preg_match($regex, (string) $subject, $matches, PREG_OFFSET_CAPTURE, 0);
+ return \preg_match($regex, (string) $subject, $matches, \PREG_OFFSET_CAPTURE, 0);
},
];
}
diff --git a/src/Image.php b/src/Image.php
index 88e58e8..ec3de63 100644
--- a/src/Image.php
+++ b/src/Image.php
@@ -34,7 +34,7 @@ private function __construct(string $content, string $style)
*/
public function __toString(): string
{
- return (string) $this->content;
+ return $this->content;
}
/**
diff --git a/src/Poser.php b/src/Poser.php
index d199026..2fbc869 100644
--- a/src/Poser.php
+++ b/src/Poser.php
@@ -13,12 +13,9 @@ class Poser
*
* @param $renders
*/
- public function __construct($renders)
+ public function __construct(array $renders)
{
$this->renders = [];
- if (!\is_array($renders)) {
- $renders = [$renders];
- }
foreach ($renders as $render) {
$this->addStyleRender($render);
diff --git a/src/UI/Command.php b/src/UI/Command.php
index 6b7aa8b..0c093b9 100644
--- a/src/UI/Command.php
+++ b/src/UI/Command.php
@@ -28,6 +28,18 @@ class Command extends BaseCommand
protected string $header;
+ public function __construct(string $name = null)
+ {
+ parent::__construct($name);
+
+ $this->poser = new Poser([
+ new SvgPlasticRender(),
+ new SvgFlatRender(),
+ new SvgFlatSquareRender(),
+ ]);
+ $this->header = self::HEADER;
+ }
+
private function init(): void
{
$this->poser = new Poser([
diff --git a/src/UI/SingleCommandApplication.php b/src/UI/SingleCommandApplication.php
index 877e738..e0e90c3 100644
--- a/src/UI/SingleCommandApplication.php
+++ b/src/UI/SingleCommandApplication.php
@@ -51,7 +51,7 @@ public function __construct(Command $command, string $version = 'UNKNOWN')
// Add the given command as single (accessible) command.
$this->add($command);
- $this->commandName = (string) $commandName;
+ $this->commandName = $commandName;
// Override the Application's definition so that it does not
// require a command name as first argument.