Update to PHP 8.2, namespace and add author

.gitattributes

@@ -1,8 +1,8 @@
 /spec export-ignore
-.coveralls.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpspec.yml.dist export-ignore
+.php-cs-fixer.php export-ignore
+phpspec.yml export-ignore
+rector.php export-ignore
+phpstan.neon export-ignore

.github/workflows/php.yml

@@ -0,0 +1,43 @@
+name: PHP Composer
+
+on:
+    push:
+        branches: [ "master" ]
+    pull_request:
+        branches: [ "master" ]
+
+permissions:
+    contents: read
+
+jobs:
+    build:
+
+        runs-on: ubuntu-latest
+
+        steps:
+            -   uses: actions/checkout@v4
+
+            -   name: Validate composer.json and composer.lock
+                run: docker compose run composer validate --strict
+
+            -   name: Cache Composer packages
+                id: composer-cache
+                uses: actions/cache@v3
+                with:
+                    path: vendor
+                    key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }}-${{ github.ref_name }}
+                    restore-keys: |
+                        ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }}
+                        ${{ runner.os }}-php-
+
+            -   name: Install packages
+                run: docker compose run composer install
+
+            -   name: Run test suite
+                run: docker compose run phpspec
+
+            -   name: Run static analyzer
+                run: docker compose run phpstan
+
+            -   name: Run code style checker
+                run: docker compose run php-cs-fixer --dry-run

.gitignore

@@ -2,3 +2,4 @@
 build/
 vendor/
 composer.lock
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(['vendor', 'build'])
+    ->in(__DIR__);
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
+    ])
+    ->setFinder($finder);

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Rik Bruil
+Copyright (c) 2024 Nicholas Ruunu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -1,9 +1,4 @@
 # Specification
-[![Build Status](https://travis-ci.org/rikbruil/specification.svg)](https://travis-ci.org/rikbruil/specification)
-[![Coverage Status](https://coveralls.io/repos/rikbruil/specification/badge.svg?branch=master)](https://coveralls.io/r/rikbruil/specification?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/rikbruil/specification/v/stable.svg)](https://packagist.org/packages/rikbruil/specification)
-[![License](https://poser.pugx.org/rikbruil/specification/license.svg)](https://packagist.org/packages/rikbruil/specification)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/1b2454be-832e-4086-9f64-759f1ff5a089/mini.png)](https://insight.sensiolabs.com/projects/1b2454be-832e-4086-9f64-759f1ff5a089)
 
 PHP implementation of the [Specification pattern][specification_pattern]
 

composer.json

@@ -8,10 +8,6 @@
     {
       "name": "Nicholas Ruunu",
       "email": "nicholas@ruu.nu"
-    },
-    {
-      "name": "Rik Bruil",
-      "email": "rik.bruil@gmail.com"
     }
   ],
   "minimum-stability": "stable",
@@ -26,7 +22,9 @@
   },
   "require-dev": {
     "phpspec/phpspec": "^7.5",
-    "rector/rector": "^1.1"
+    "rector/rector": "^1.1",
+    "phpstan/phpstan": "^1.11",
+    "friendsofphp/php-cs-fixer": "^3.59"
   },
   "extra": {
     "branch-alias": {
@@ -35,6 +33,7 @@
   },
   "scripts": {
     "test": "vendor/bin/phpspec run",
+    "static-analyzer": "vendor/bin/phpstan",
     "fix-style": "vendor/bin/php-cs-fixer fix"
   }
 }

docker-compose.yaml

@@ -0,0 +1,25 @@
+services:
+    php: &php
+        image: php:8.2-cli-alpine
+        volumes:
+            - .:/app
+        working_dir: /app
+
+    phpspec:
+        <<: *php
+        entrypoint: vendor/bin/phpspec
+        command: run
+
+    phpstan:
+        <<: *php
+        entrypoint: vendor/bin/phpstan
+
+    php-cs-fixer:
+        <<: *php
+        entrypoint: vendor/bin/php-cs-fixer fix
+
+    composer:
+        image: composer:latest
+        volumes:
+            - .:/app
+        working_dir: /app

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+    level: max
+    paths:
+        - src

rector.php

@@ -1,16 +1,14 @@
 <?php
 
 use Rector\Config\RectorConfig;
-use Rector\Doctrine\Set\DoctrineSetList;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
 
 return RectorConfig::configure()->withPaths([
-        __DIR__ . '/src',
-        __DIR__ . '/spec',
-    ])->withPhpSets(php83: true)->withAttributesSets(
-        symfony: true,
-        doctrine: true,
-    )
+    __DIR__.'/src',
+    __DIR__.'/spec',
+])->withPhpSets(php83: true)->withAttributesSets(
+    symfony: true,
+    doctrine: true,
+)
     // here we can define, what prepared sets of rules will be applied
     ->withPreparedSets(
         deadCode: true,

spec/CompositeSpecificationSpec.php

@@ -18,15 +18,15 @@ public function let(): void
 
     public function it_is_initializable(): void
     {
-        $this->shouldHaveType(\Purist\Specification\CompositeSpecification::class);
+        $this->shouldHaveType(CompositeSpecification::class);
     }
 
     public function it_should_return_and_specification(SpecificationInterface $specification): void
     {
         $specification->isSatisfiedBy('foo')->willReturn(true);
 
         $and = $this->andX($specification);
-        $and->shouldHaveType(\Purist\Specification\AndX::class);
+        $and->shouldHaveType(AndX::class);
         $and->isSatisfiedBy('foo')->shouldReturn(true);
     }
 
@@ -35,7 +35,7 @@ public function it_should_return_or_specification(SpecificationInterface $specif
         $specification->isSatisfiedBy('foo')->willReturn(false);
 
         $or = $this->orX($specification);
-        $or->shouldHaveType(\Purist\Specification\OrX::class);
+        $or->shouldHaveType(OrX::class);
         $or->isSatisfiedBy('foo')->shouldReturn(true);
     }
 
@@ -44,19 +44,16 @@ public function it_should_return_not_specification(SpecificationInterface $speci
         $specification->isSatisfiedBy('foo')->willReturn(true);
 
         $not = $this->not($specification);
-        $not->shouldHaveType(\Purist\Specification\Not::class);
+        $not->shouldHaveType(Not::class);
         $not->isSatisfiedBy('foo')->shouldReturn(false);
     }
 }
 
 readonly class DummySpec extends CompositeSpecification
 {
-    /**
-     * {@inheritDoc}
-     */
     #[\Override]
     public function isSatisfiedBy($value): bool
     {
-        return $value === 'foo';
+        return 'foo' === $value;
     }
 }

spec/NotSpec.php

@@ -13,9 +13,9 @@ public function it_should_have_correct_types(SpecificationInterface $specificati
     {
         $this->beConstructedWith($specification);
 
-        $this->shouldHaveType(\Purist\Specification\Not::class);
-        $this->shouldHaveType(\Purist\Specification\SpecificationInterface::class);
-        $this->shouldHaveType(\Purist\Specification\CompositeSpecification::class);
+        $this->shouldHaveType(Not::class);
+        $this->shouldHaveType(SpecificationInterface::class);
+        $this->shouldHaveType(CompositeSpecification::class);
     }
 
     public function it_should_pass_if_child_fails(SpecificationInterface $specification): void

src/AndX.php

@@ -2,15 +2,12 @@
 
 namespace Purist\Specification;
 
-readonly final class AndX extends CompositeSpecification
+final readonly class AndX extends CompositeSpecification
 {
     public function __construct(private SpecificationInterface $x, private SpecificationInterface $y)
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     #[\Override]
     public function isSatisfiedBy(mixed $value): bool
     {

src/CompositeSpecification.php

@@ -2,7 +2,7 @@
 
 namespace Purist\Specification;
 
-readonly abstract class CompositeSpecification implements CompositeSpecificationInterface
+abstract readonly class CompositeSpecification implements CompositeSpecificationInterface
 {
     #[\Override]
     public function andX(SpecificationInterface $specification): AndX

src/Not.php

@@ -2,15 +2,12 @@
 
 namespace Purist\Specification;
 
-readonly final class Not extends CompositeSpecification
+final readonly class Not extends CompositeSpecification
 {
     public function __construct(private SpecificationInterface $wrapped)
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     #[\Override]
     public function isSatisfiedBy(mixed $value): bool
     {

src/OrX.php

@@ -2,17 +2,14 @@
 
 namespace Purist\Specification;
 
-readonly final class OrX extends CompositeSpecification
+final readonly class OrX extends CompositeSpecification
 {
     public function __construct(private SpecificationInterface $x, private SpecificationInterface $y)
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     #[\Override]
-    public function isSatisfiedBy(mixed $value) : bool
+    public function isSatisfiedBy(mixed $value): bool
     {
         return $this->x->isSatisfiedBy($value) || $this->y->isSatisfiedBy($value);
     }