Bump the requirements to PHP 8.1

Author: mbabker

.github/workflows/continuous-integration.yml

@@ -24,8 +24,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
@@ -38,20 +36,20 @@ jobs:
           - ""
         include:
           - deps: "lowest"
-            php-version: "7.4"
+            php-version: "8.1"
           - deps: "highest"
             php-version: "8.4"
           # Run builds on low and high PHP versions with `doctrine/annotations` removed
           - deps: "highest"
-            php-version: "7.4"
+            php-version: "8.1"
             no-annotations: true
           - deps: "highest"
             php-version: "8.4"
             no-annotations: true
           # Run builds on high PHP version with `doctrine/orm` version pinned
           - deps: "highest"
             php-version: "8.4"
-            orm: "^2.14"
+            orm: "^2.20"
           - deps: "highest"
             php-version: "8.4"
             orm: "^3.0"
@@ -109,7 +107,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.2"
+          php-version: "8.4"
           extensions: mongodb
 
       - name: "Install dependencies with Composer"

.php-cs-fixer.dist.php

@@ -31,8 +31,8 @@
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         '@DoctrineAnnotation' => true,
-        '@PHP74Migration' => true,
-        '@PHP74Migration:risky' => true,
+        '@PHP81Migration' => true,
+        '@PHP80Migration:risky' => true,
         '@PHPUnit91Migration:risky' => true,
         '@PSR2' => true,
         '@Symfony' => true,
@@ -78,6 +78,7 @@
         'random_api_migration' => true,
         'return_assignment' => true,
         'self_accessor' => true,
+        'single_line_empty_body' => true,
         'static_lambda' => true,
         'strict_param' => true,
         'ternary_to_null_coalescing' => true,

CHANGELOG.md

@@ -21,6 +21,9 @@ a release.
 ### Added
 - IP address provider for use with extensions with IP address references (#2928)
 
+### Changed
+- Dropped support for PHP < 8.1
+
 ## [3.19.0] - 2025-02-24
 ### Added
 - Actor provider for use with extensions with user references (#2914)

composer.json

@@ -40,8 +40,8 @@
         "wiki": "https://github.com/Atlantic18/DoctrineExtensions/tree/main/doc"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
-        "behat/transliterator": "^1.2",
+        "php": "^8.1",
+        "behat/transliterator": "^1.3",
         "doctrine/collections": "^1.2 || ^2.0",
         "doctrine/deprecations": "^1.0",
         "doctrine/event-manager": "^1.2 || ^2.0",

example/app/Command/PrintCategoryTranslationTreeCommand.php

@@ -18,15 +18,14 @@
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
 use Gedmo\Translatable\Query\TreeWalker\TranslationWalker;
 use Gedmo\Translatable\TranslatableListener;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'app:print-category-translation-tree', description: 'Seeds an example category tree with translations and prints the tree.')]
 final class PrintCategoryTranslationTreeCommand extends Command
 {
-    protected static $defaultName = 'app:print-category-translation-tree';
-    protected static $defaultDescription = 'Seeds an example category tree with translations and prints the tree.';
-
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var EntityManagerHelper $helper */

example/app/Entity/Category.php

@@ -13,6 +13,7 @@
 
 use App\Entity\Repository\CategoryRepository;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -29,7 +30,7 @@
 #[ORM\Table(name: 'ext_categories')]
 #[ORM\Entity(repositoryClass: CategoryRepository::class)]
 #[Gedmo\TranslationEntity(class: CategoryTranslation::class)]
-class Category
+class Category implements \Stringable
 {
     /**
      * @ORM\Column(type="integer")
@@ -39,33 +40,27 @@ class Category
     #[ORM\Column(type: Types::INTEGER)]
     #[ORM\Id]
     #[ORM\GeneratedValue]
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var string|null
-     *
      * @Gedmo\Translatable
      *
      * @ORM\Column(length=64)
      */
     #[Gedmo\Translatable]
     #[ORM\Column(length: 64)]
-    private $title;
+    private ?string $title = null;
 
     /**
-     * @var string|null
-     *
      * @Gedmo\Translatable
      *
      * @ORM\Column(type="text", nullable=true)
      */
     #[Gedmo\Translatable]
     #[ORM\Column(type: Types::TEXT, nullable: true)]
-    private $description;
+    private ?string $description = null;
 
     /**
-     * @var string|null
-     *
      * @Gedmo\Translatable
      * @Gedmo\Slug(fields={"created", "title"})
      *
@@ -74,7 +69,7 @@ class Category
     #[Gedmo\Translatable]
     #[Gedmo\Slug(fields: ['created', 'title'])]
     #[ORM\Column(length: 64, unique: true)]
-    private $slug;
+    private ?string $slug = null;
 
     /**
      * @Gedmo\TreeLeft
@@ -83,7 +78,7 @@ class Category
      */
     #[Gedmo\TreeLeft]
     #[ORM\Column(type: Types::INTEGER)]
-    private $lft;
+    private ?int $lft = null;
 
     /**
      * @Gedmo\TreeRight
@@ -92,7 +87,7 @@ class Category
      */
     #[Gedmo\TreeRight]
     #[ORM\Column(type: Types::INTEGER)]
-    private $rgt;
+    private ?int $rgt = null;
 
     /**
      * @Gedmo\TreeParent
@@ -103,7 +98,7 @@ class Category
     #[Gedmo\TreeParent]
     #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
     #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'id', onDelete: 'CASCADE')]
-    private $parent;
+    private ?self $parent = null;
 
     /**
      * @Gedmo\TreeRoot
@@ -112,7 +107,7 @@ class Category
      */
     #[Gedmo\TreeRoot]
     #[ORM\Column(type: Types::INTEGER, nullable: true)]
-    private $root;
+    private ?int $root = null;
 
     /**
      * @Gedmo\TreeLevel
@@ -121,9 +116,11 @@ class Category
      */
     #[Gedmo\TreeLevel]
     #[ORM\Column(name: 'lvl', type: Types::INTEGER)]
-    private $level;
+    private ?int $level = null;
 
     /**
+     * @var Collection<array-key, self>
+     *
      * @ORM\OneToMany(targetEntity="Category", mappedBy="parent")
      */
     #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
@@ -136,7 +133,7 @@ class Category
      */
     #[Gedmo\Timestampable(on: 'create')]
     #[ORM\Column(type: Types::DATETIME_MUTABLE)]
-    private $created;
+    private ?\DateTime $created = null;
 
     /**
      * @Gedmo\Timestampable(on="update")
@@ -145,7 +142,7 @@ class Category
      */
     #[Gedmo\Timestampable(on: 'update')]
     #[ORM\Column(type: Types::DATETIME_MUTABLE)]
-    private $updated;
+    private ?\DateTime $updated = null;
 
     /**
      * @Gedmo\Blameable(on="create")
@@ -154,7 +151,7 @@ class Category
      */
     #[Gedmo\Blameable(on: 'create')]
     #[ORM\Column(type: Types::STRING)]
-    private $createdBy;
+    private ?string $createdBy = null;
 
     /**
      * @Gedmo\Blameable(on="update")
@@ -163,123 +160,131 @@ class Category
      */
     #[Gedmo\Blameable(on: 'update')]
     #[ORM\Column(type: Types::STRING)]
-    private $updatedBy;
+    private ?string $updatedBy = null;
 
     /**
+     * @var Collection<array-key, CategoryTranslation>
+     *
      * @ORM\OneToMany(
      *     targetEntity="CategoryTranslation",
      *     mappedBy="object",
      *     cascade={"persist", "remove"}
      * )
      */
     #[ORM\OneToMany(targetEntity: CategoryTranslation::class, mappedBy: 'object', cascade: ['persist', 'remove'])]
-    private $translations;
+    private Collection $translations;
 
     public function __construct()
     {
         $this->children = new ArrayCollection();
         $this->translations = new ArrayCollection();
     }
 
-    public function __toString()
+    public function __toString(): string
     {
-        return $this->getTitle();
+        return (string) $this->getTitle();
     }
 
-    public function getTranslations()
+    /**
+     * @return Collection<CategoryTranslation>
+     */
+    public function getTranslations(): Collection
     {
         return $this->translations;
     }
 
-    public function addTranslation(CategoryTranslation $t)
+    public function addTranslation(CategoryTranslation $t): void
     {
         if (!$this->translations->contains($t)) {
             $this->translations[] = $t;
             $t->setObject($this);
         }
     }
 
-    public function getSlug()
+    public function getSlug(): ?string
     {
         return $this->slug;
     }
 
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function setTitle($title)
+    public function setTitle(?string $title): void
     {
         $this->title = $title;
     }
 
-    public function getTitle()
+    public function getTitle(): ?string
     {
         return $this->title;
     }
 
-    public function setDescription($description)
+    public function setDescription(?string $description): void
     {
         $this->description = $description;
     }
 
-    public function getDescription()
+    public function getDescription(): ?string
     {
         return $this->description;
     }
 
-    public function setParent($parent)
+    public function setParent(?self $parent): void
     {
         $this->parent = $parent;
     }
 
-    public function getParent()
+    public function getParent(): ?self
     {
         return $this->parent;
     }
 
-    public function getRoot()
+    public function getRoot(): ?int
     {
         return $this->root;
     }
 
-    public function getLevel()
+    public function getLevel(): ?int
     {
         return $this->level;
     }
 
-    public function getChildren()
+    /**
+     * @return Collection<self>
+     */
+    public function getChildren(): Collection
     {
         return $this->children;
     }
 
-    public function getLeft()
+    public function getLeft(): ?int
     {
         return $this->lft;
     }
 
-    public function getRight()
+    public function getRight(): ?int
     {
         return $this->rgt;
     }
 
-    public function getCreated()
+    public function getCreated(): ?\DateTime
     {
         return $this->created;
     }
 
-    public function getUpdated()
+    public function getUpdated(): ?\DateTime
     {
         return $this->updated;
     }
 
-    public function getCreatedBy()
+    public function getCreatedBy(): ?string
     {
         return $this->createdBy;
     }
 
-    public function getUpdatedBy()
+    public function getUpdatedBy(): ?string
     {
         return $this->updatedBy;
     }