Upgrade 8.3

.gitattributes

@@ -1,8 +1,9 @@
 /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
+phpstan-baseline.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

@@ -1,4 +1,4 @@
-build/
+coverage/
 vendor/
-.php_cs.cache
+.php-cs-fixer.cache
 composer.lock

.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);

Dockerfile

@@ -0,0 +1,6 @@
+FROM php:8.3-cli-alpine
+RUN apk add --no-cache --update --virtual .build-deps $PHPIZE_DEPS linux-headers \
+    && pecl install xdebug-3.3.2 \
+    && docker-php-ext-enable xdebug \
+    && apk del -f .build-deps \
+    && echo "xdebug.mode=coverage" >> $PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini

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,24 +1,23 @@
-# Doctrine Specification 
-[![Build Status](https://travis-ci.org/rikbruil/Doctrine-Specification.svg)](https://travis-ci.org/rikbruil/Doctrine-Specification)
-[![Coverage Status](https://coveralls.io/repos/rikbruil/Doctrine-Specification/badge.svg?branch=master)](https://coveralls.io/r/rikbruil/Doctrine-Specification?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/rikbruil/doctrine-specification/v/stable.svg)](https://packagist.org/packages/rikbruil/doctrine-specification)
-[![License](https://poser.pugx.org/rikbruil/doctrine-specification/license.svg)](https://packagist.org/packages/rikbruil/doctrine-specification)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rikbruil/Doctrine-Specification/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/rikbruil/Doctrine-Specification/?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/bb221821-1ba6-4613-b39f-f43718aaa92d/mini.png)](https://insight.sensiolabs.com/projects/bb221821-1ba6-4613-b39f-f43718aaa92d)
+# Doctrine Specification
 
-Doctrine [Specification pattern][specification_pattern] for building queries dynamically and with re-usable classes for composition.
+Doctrine [Specification pattern][specification_pattern] for building queries dynamically and with re-usable classes for
+composition.
 
-This library started out as an adaptation of Benjamin Eberlei's [blog post][blog_post]. I was also inspired by the [Happyr Doctrine-Specification][happyr_spec] code, however this library has some small differences.
-The main one is that SpecificationRepository->match() does not return the results directly, but returns the query object.
+This library started out as an adaptation of Benjamin Eberlei's [blog post][blog_post]. I was also inspired by
+the [Happyr Doctrine-Specification][happyr_spec] code, however this library has some small differences.
+The main one is that SpecificationRepository->match() does not return the results directly, but returns the query
+object.
 
 Since I like Doctrine's Paginator object, I wanted to be able to use that in combination with the Specification pattern.
 
-__Note:__ In versions prior to 1.2 it was required to extend the SpecificationRepository class. This is no longer needed since we provide a SpecificationRepositoryTrait that you can use instead.
-The class is still provided for backwards compatibility reasons. There is also the SpecificationAwareInterface that you can use if you need it.
+__Note:__ In versions prior to 1.2 it was required to extend the SpecificationRepository class. This is no longer needed
+since we provide a SpecificationRepositoryTrait that you can use instead.
+The class is still provided for backwards compatibility reasons. There is also the SpecificationAwareInterface that you
+can use if you need it.
 
 ## Usage
 
-Install the latest version with `composer require rikbruil/doctrine-specification`
+Install the latest version with `composer require purist/doctrine-specification`
 
 ```php
 // Not using the lib
@@ -43,12 +42,12 @@ return $qb->where('r.ended = 0')
 ```
 
 ```php
-use Rb\Specification\Doctrine\Condition\Equals;
-use Rb\Specification\Doctrine\Condition\IsNull;
-use Rb\Specification\Doctrine\Condition\LessThan;
-use Rb\Specification\Doctrine\Logic\AndX;
-use Rb\Specification\Doctrine\Logic\OrX;
-use Rb\Specification\Doctrine\Specification;
+use Purist\Specification\Doctrine\Condition\Equals;
+use Purist\Specification\Doctrine\Condition\IsNull;
+use Purist\Specification\Doctrine\Condition\LessThan;
+use Purist\Specification\Doctrine\Logic\AndX;
+use Purist\Specification\Doctrine\Logic\OrX;
+use Purist\Specification\Doctrine\Specification;
 
 // Using the lib
 $spec = new Specification([
@@ -67,6 +66,7 @@ return $this->em->getRepository('Advertisement')->match($spec)->execute();
 ```
 
 ## Composition
+
 A bonus of this pattern is composition, which makes specifications very reusable:
 
 ```php
@@ -89,7 +89,7 @@ class ExpiredAds extends Specification
         ];
         parent::__construct($specs);
     }
-    
+
     public function isSatisfiedBy($value)
     {
         return $value === Advertisement::class;
@@ -107,7 +107,7 @@ class AdsByUser extends Specification
             new Join('user', 'u'),
             new Equals('id', $user->getId(), 'u'),
         ];
-        
+
         parent::__construct($specs);
     }
 
@@ -131,7 +131,7 @@ class SomeService
 
         return $this->em->getRepository('Advertisement')->match($spec)->execute();
     }
-    
+
     /**
      * Fetch adverts paginated by Doctrine Paginator with joins intact.
      * A paginator can be iterated over like a normal array or Doctrine Collection
@@ -142,7 +142,7 @@ class SomeService
             new ExpiredAds(),
             new AdsByUser($user),
         ]);
-        
+
         $query = $this->em->getRepository('Advertisement')->match($spec);
         $query->setFirstResult(($page - 1) * $size))
             ->setMaxResults($size);
@@ -155,7 +155,7 @@ class SomeService
 
 Doctrine-Specification requires:
 
-- PHP 5.5+
+- PHP 8.3+
 - Doctrine 2.2
 
 ## License

composer.json

@@ -1,33 +1,34 @@
 {
-  "name": "rikbruil/doctrine-specification",
+  "name": "purist/doctrine-specification",
   "description": "Doctrine Specification pattern for building queries dynamically and with re-usable classes for composition.",
   "type": "library",
   "keywords": ["doctrine", "repository", "specification"],
   "license": "MIT",
   "authors": [
     {
-      "name": "Rik Bruil",
-      "email": "rik.bruil@gmail.com"
+      "name": "Nicholas Ruunu",
+      "email": "nicholas@ruu.nu"
     }
   ],
   "minimum-stability": "stable",
   "autoload": {
-    "psr-4": {"Rb\\Specification\\Doctrine\\": "src/"}
+    "psr-4": {"Purist\\Specification\\Doctrine\\": "src/"}
   },
   "autoload-dev": {
-    "psr-4": {"spec\\Rb\\Specification\\Doctrine\\": "spec/"}
+    "psr-4": {"spec\\Purist\\Specification\\Doctrine\\": "spec/"}
   },
   "require": {
-    "php": ">=5.5",
-    "doctrine/orm": "^2.2",
-    "doctrine/collections": "^1.2",
-    "rikbruil/specification": "0.9.*"
+    "php": "^8.3",
+    "doctrine/orm": "^2.2|^3.0",
+    "doctrine/collections": "^2.0",
+    "purist/specification": "dev-master"
   },
   "require-dev": {
-    "phpspec/phpspec": "^2.0",
-    "henrikbjorn/phpspec-code-coverage": "^2.0",
-    "friendsofphp/php-cs-fixer": "^2.0",
-    "satooshi/php-coveralls": "^1.0"
+    "phpspec/phpspec": "^7.5",
+    "rector/rector": "^1.1",
+    "friendsofphp/php-cs-fixer": "^3.59",
+    "phpstan/phpstan": "^1.11",
+    "friends-of-phpspec/phpspec-code-coverage": "^6.3"
   },
   "extra": {
     "branch-alias": {
@@ -36,6 +37,11 @@
   },
   "scripts": {
     "test": "vendor/bin/phpspec run",
+    "static-analyzer": "vendor/bin/phpstan",
+    "check-style": "vendor/bin/php-cs-fixer fix --dry-run",
     "fix-style": "vendor/bin/php-cs-fixer fix"
-  }
+  },
+  "repositories": [
+    { "type": "git", "url": "https://github.com/PuristPHP/specification.git" }
+  ]
 }

docker-compose.yaml

@@ -0,0 +1,25 @@
+services:
+    php: &php
+        build: .
+        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

phpspec.yml

@@ -0,0 +1,13 @@
+suites:
+    main:
+        namespace: Purist\Specification\Doctrine
+        psr4_prefix: Purist\Specification\Doctrine
+extensions:
+    FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension:
+        format:
+            - text
+            - clover
+            - html
+        output:
+            html: coverage/html
+            clover: coverage/clover.xml

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Result/ModifierCollection.php
+
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Specification.php