Upgrade dependencies + fix deprecations

Author: Kai Eichinger

.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
                   command: COMPOSER_MEMORY_LIMIT=-1 composer normalize --indent-size 4 --indent-style space --dry-run
             - run:
                   name: PHP CS Fixer
-                  command: ./vendor/bin/php-cs-fixer fix --diff --config vendor-bin/test/vendor/becklyn/php-cs/.php_cs.dist --dry-run --no-interaction
+                  command: ./vendor/bin/php-cs-fixer fix --diff --config vendor-bin/test/vendor/becklyn/php-cs/.php_cs.dist.php --dry-run --no-interaction
             - run:
                   name: PHPUnit
                   command: ./vendor/bin/simple-phpunit -c phpunit.xml --colors=always --testdox

.gitignore

@@ -4,3 +4,4 @@
 /vendor
 /vendor-bin/*/composer.lock
 /vendor-bin/*/vendor
+/.php-cs-fixer.cache

CHANGELOG.md

@@ -1,3 +1,10 @@
+8.5.1
+=====
+
+*   (improvement) Fix Symfony 5.4 deprecations + remove unused fields/services
+*   (internal) Upgrade dependencies.
+
+
 8.5.0
 =====
 

composer.json

@@ -1,53 +1,45 @@
 {
     "name": "becklyn/rad",
-    "type": "symfony-bundle",
     "description": "RAD related functionality for usage in Symfony.",
-    "homepage": "https://github.com/Becklyn/rad",
     "license": "BSD-3-Clause",
+    "type": "symfony-bundle",
     "authors": [
         {
             "name": "Becklyn Studios",
             "homepage": "http://becklyn.com/"
         }
     ],
+    "homepage": "https://github.com/Becklyn/rad",
     "require": {
-        "php": "^7.4",
+        "php": ">=7.4",
         "ext-json": "*",
-        "beberlei/doctrineextensions": "^1.2",
+        "beberlei/doctrineextensions": "^1.3.0",
         "becklyn/rad-bundles": "^1.0.1",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/orm": "^2.7",
-        "psr/log": "^1.1",
-        "scienta/doctrine-json-functions": "^4.1",
-        "symfony/config": "^5.1",
-        "symfony/dependency-injection": "^5.1",
-        "symfony/form": "^5.1",
-        "symfony/http-kernel": "^5.1",
-        "symfony/property-access": "^5.1",
-        "symfony/translation-contracts": "^2.1",
-        "symfony/validator": "^5.1",
-        "twig/twig": "^3.0"
-    },
-    "conflict": {
-        "becklyn/rad-bundle": "*"
+        "doctrine/doctrine-bundle": "^2.3.2",
+        "doctrine/orm": "^2.7.5",
+        "psr/log": "^1.1.4",
+        "scienta/doctrine-json-functions": "^4.4.0",
+        "symfony/config": "^5.4.0",
+        "symfony/dependency-injection": "^5.4.0",
+        "symfony/form": "^5.4.0",
+        "symfony/http-kernel": "^5.4.0",
+        "symfony/property-access": "^5.4.0",
+        "symfony/translation-contracts": "^2.5.0",
+        "symfony/validator": "^5.4.0",
+        "twig/twig": "^3.3.4"
     },
     "require-dev": {
-        "algolia/search-bundle": "^4.1",
+        "algolia/search-bundle": "^4.1.2",
         "roave/security-advisories": "dev-master",
-        "symfony/phpunit-bridge": "^5.1",
-        "symfony/twig-bridge": "^5.1"
+        "symfony/phpunit-bridge": "^5.4.0",
+        "symfony/twig-bridge": "^5.4.0"
+    },
+    "conflict": {
+        "becklyn/rad-bundle": "*"
     },
     "suggest": {
         "symfony/twig-bridge": "To use the default form theme."
     },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-next": "8.x-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Becklyn\\Rad\\": "src/"
@@ -57,5 +49,13 @@
         "psr-4": {
             "Tests\\Becklyn\\Rad\\": "tests/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-next": "8.x-dev"
+        }
     }
 }

src/BecklynRadBundle.php

@@ -5,17 +5,15 @@
 use Becklyn\Rad\DependencyInjection\BecklynRadExtension;
 use Becklyn\Rad\DependencyInjection\DoctrineExtensionsCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-/**
- *
- */
 class BecklynRadBundle extends Bundle
 {
     /**
      * @inheritDoc
      */
-    public function getContainerExtension ()
+    public function getContainerExtension () : ?ExtensionInterface
     {
         return new BecklynRadExtension($this);
     }

src/Controller/BaseController.php

@@ -149,7 +149,7 @@ protected function ajaxResponse (bool $ok, ?string $status = null) : AjaxRespons
     /**
      * @inheritDoc
      */
-    public static function getSubscribedServices ()
+    public static function getSubscribedServices () : array
     {
         $services = parent::getSubscribedServices();
         $services[] = LoggerInterface::class;

src/Sortable/PropertiesSortableHandler.php

@@ -13,7 +13,6 @@
  */
 final class PropertiesSortableHandler
 {
-    private EntityRepository $repository;
     private SortableHandler $nested;
     /** @var string[] */
     private array $properties;
@@ -25,7 +24,6 @@ final class PropertiesSortableHandler
      */
     public function __construct (EntityRepository $repository, string ...$properties)
     {
-        $this->repository = $repository;
         $this->nested = new SortableHandler($repository);
         $this->properties = $properties;
         $this->accessor = PropertyAccess::createPropertyAccessor();
@@ -62,9 +60,7 @@ public function fixSortOrder (SortableEntityInterface $removedEntity) : void
      */
     public function sortElementBefore (SortableEntityInterface $entity, ?SortableEntityInterface $before) : bool
     {
-        return $this->areCompatible($entity, $before)
-            ? $this->nested->sortElementBefore($entity, $before, $this->buildWhere($entity))
-            : false;
+        return $this->areCompatible($entity, $before) && $this->nested->sortElementBefore($entity, $before, $this->buildWhere($entity));
     }
 
 

vendor-bin/test/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "becklyn/php-cs": "^6"
+        "becklyn/php-cs": ">=17"
     }
 }