Update to PHP 8.3, Doctrine ORM 3 and Collections 2

Author: nicholasruunu

.coveralls.yml

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

.gitignore

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

.php-cs-fixer.php

@@ -1,4 +1,4 @@
-# Doctrine Specification 
+# 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)
@@ -43,12 +43,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([
@@ -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

.php_cs

@@ -12,22 +12,21 @@
   ],
   "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"
   },
   "extra": {
     "branch-alias": {
@@ -37,5 +36,8 @@
   "scripts": {
     "test": "vendor/bin/phpspec run",
     "fix-style": "vendor/bin/php-cs-fixer fix"
-  }
+  },
+  "repositories": [
+    { "type": "git", "url": "https://github.com/PuristPHP/specification.git" }
+  ]
 }

README.md

@@ -0,0 +1,6 @@
+services:
+    php:
+        image: php:8.3-cli-alpine
+        volumes:
+            - .:/app
+        working_dir: /app

composer.json

@@ -1,6 +1,3 @@
-extensions:
-    - PhpSpec\Extension\CodeCoverageExtension
-
 code_coverage:
     format:
         - clover
@@ -11,5 +8,5 @@ code_coverage:
 
 suites:
     main:
-        namespace: Rb\Specification\Doctrine
-        psr4_prefix: Rb\Specification\Doctrine
+        namespace: Purist\Specification\Doctrine
+        psr4_prefix: Purist\Specification\Doctrine

docker-compose.yaml

@@ -0,0 +1,24 @@
+<?php
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __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,
+        codeQuality: true,
+        typeDeclarations: true,
+        privatization: true,
+        instanceOf: true,
+        earlyReturn: true,
+        strictBooleans: true,
+    );

phpspec.yml.dist

@@ -1,34 +1,34 @@
 <?php
 
-namespace spec\Rb\Specification\Doctrine\Condition;
+namespace spec\Purist\Specification\Doctrine\Condition;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use PhpSpec\ObjectBehavior;
-use Rb\Specification\Doctrine\SpecificationInterface;
+use Purist\Specification\Doctrine\SpecificationInterface;
 
 class BetweenSpec extends ObjectBehavior
 {
-    private $field = 'foo';
+    private string $field = 'foo';
 
-    private $from = 1;
+    private int $from = 1;
 
-    private $to = 5;
+    private int $to = 5;
 
-    public function let()
+    public function let(): void
     {
         $this->beConstructedWith($this->field, $this->from, $this->to);
     }
 
-    public function it_is_an_expression()
+    public function it_is_an_expression(): void
     {
         $this->shouldBeAnInstanceOf(SpecificationInterface::class);
     }
 
-    public function it_returns_an_expression_func_object(QueryBuilder $queryBuilder, ArrayCollection $parameters, Expr $expr)
+    public function it_returns_an_expression_func_object(QueryBuilder $queryBuilder, ArrayCollection $parameters, Expr $expr): void
     {
-        $dqlAlias   = 'a';
+        $dqlAlias = 'a';
         $expression = 'a.foo between(:from_10, :to_10)';
 
         $queryBuilder->expr()->willReturn($expr);
@@ -37,16 +37,16 @@ public function it_returns_an_expression_func_object(QueryBuilder $queryBuilder,
         $queryBuilder->getParameters()->willReturn($parameters);
         $parameters->count()->willReturn(10);
 
-        $queryBuilder->setParameter('from_10', $this->from)->shouldBeCalled();
-        $queryBuilder->setParameter('to_10', $this->to)->shouldBeCalled();
+        $queryBuilder->setParameter('from_10', $this->from)->shouldBeCalled()->willReturn($queryBuilder);
+        $queryBuilder->setParameter('to_10', $this->to)->shouldBeCalled()->willReturn($queryBuilder);
 
         $this->isSatisfiedBy('foo')->shouldReturn(true);
         $this->modify($queryBuilder, $dqlAlias)->shouldReturn($expression);
     }
 
-    public function it_should_use_dql_alias_if_set(QueryBuilder $queryBuilder, ArrayCollection $parameters, Expr $expr)
+    public function it_should_use_dql_alias_if_set(QueryBuilder $queryBuilder, ArrayCollection $parameters, Expr $expr): void
     {
-        $dqlAlias   = 'x';
+        $dqlAlias = 'x';
         $expression = 'x.foo between(:from_10, :to_10)';
 
         $this->beConstructedWith($this->field, $this->from, $this->to, $dqlAlias);
@@ -57,8 +57,8 @@ public function it_should_use_dql_alias_if_set(QueryBuilder $queryBuilder, Array
         $queryBuilder->getParameters()->willReturn($parameters);
         $parameters->count()->willReturn(10);
 
-        $queryBuilder->setParameter('from_10', $this->from)->shouldBeCalled();
-        $queryBuilder->setParameter('to_10', $this->to)->shouldBeCalled();
+        $queryBuilder->setParameter('from_10', $this->from)->shouldBeCalled()->willReturn($queryBuilder);
+        $queryBuilder->setParameter('to_10', $this->to)->shouldBeCalled()->willReturn($queryBuilder);
 
         $this->isSatisfiedBy('foo')->shouldReturn(true);
         $this->modify($queryBuilder, $dqlAlias)->shouldReturn($expression);