Merge pull request #31 from 21TORR/updates

Bump deps + use constants & attributes only
21TORR · Dec 21, 2023 · b2102fa · b2102fa
2 parents 357ca42 + d445f5b
commit b2102fa
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+2.7.0 (unreleased)
+=====
+
+* (improvement) Bump required Symfony.
+
+
 2.6.1
 =====
 

diff --git a/composer.json b/composer.json
@@ -16,24 +16,24 @@
 		"21torr/bundle-helpers": "^2.1",
 		"psr/log": "^3.0",
 		"symfony/dependency-injection": "^6.2",
-		"symfony/deprecation-contracts": "^3.1",
-		"symfony/framework-bundle": "^6.2",
-		"symfony/http-foundation": "^6.2",
-		"symfony/http-kernel": "^6.2"
+		"symfony/deprecation-contracts": "^3.4",
+		"symfony/framework-bundle": "^6.4",
+		"symfony/http-foundation": "^6.4",
+		"symfony/http-kernel": "^6.4"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
 		"doctrine/dbal": "^2.13",
-		"doctrine/orm": "^2.13",
-		"phpunit/phpunit": "^9.5",
+		"doctrine/orm": "^2.16",
+		"phpunit/phpunit": "^9.6",
 		"roave/security-advisories": "dev-latest",
-		"symfony/console": "^6.2",
-		"symfony/form": "^6.2",
-		"symfony/phpunit-bridge": "^6.2",
-		"symfony/routing": "^6.2",
-		"symfony/security-bundle": "^6.2",
-		"symfony/translation": "^6.2",
-		"twig/twig": "^3.4"
+		"symfony/console": "^6.4",
+		"symfony/form": "^6.4",
+		"symfony/phpunit-bridge": "^6.4",
+		"symfony/routing": "^6.4",
+		"symfony/security-bundle": "^6.4",
+		"symfony/translation": "^6.4",
+		"twig/twig": "^3.8"
 	},
 	"suggest": {
 		"doctrine/dbal": "To add the SerializedType",

diff --git a/src/Entity/Traits/IdTrait.php b/src/Entity/Traits/IdTrait.php
@@ -2,6 +2,7 @@
 
 namespace Torr\Rad\Entity\Traits;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Torr\Rad\Entity\Interfaces\EntityInterface;
 
@@ -11,17 +12,10 @@
 trait IdTrait
 {
 	/**
-	 * @ORM\Id()
-	 *
-	 * @ORM\GeneratedValue(strategy="AUTO")
-	 *
-	 * @ORM\Column(name="id", type="integer")
 	 */
-	#[
-		ORM\Id(),
-		ORM\GeneratedValue(strategy: "AUTO"),
-		ORM\Column(name: "id", type: "integer")
-	]
+	#[ORM\Id]
+	#[ORM\GeneratedValue(strategy: "AUTO")]
+	#[ORM\Column(name: "id", type: Types::INTEGER)]
 	private ?int $id = null;
 
 

diff --git a/src/Entity/Traits/TimestampsTrait.php b/src/Entity/Traits/TimestampsTrait.php
@@ -2,6 +2,7 @@
 
 namespace Torr\Rad\Entity\Traits;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -16,9 +17,8 @@ trait TimestampsTrait
 	private \DateTimeImmutable $timeCreated;
 
 	/**
-	 * @ORM\Column(name="time_modified", type="datetimetz_immutable", nullable=true)
 	 */
-	#[ORM\Column(name: "time_modified", type: "datetimetz_immutable", nullable: true)]
+	#[ORM\Column(name: "time_modified", type: Types::DATETIMETZ_IMMUTABLE, nullable: true)]
 	private ?\DateTimeImmutable $timeModified = null;
 
 	/**

diff --git a/vendor-bin/c-norm/composer.json b/vendor-bin/c-norm/composer.json
@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "ergebnis/composer-normalize": "^2.28"
+        "ergebnis/composer-normalize": "^2.39"
     },
     "config": {
         "allow-plugins": {

diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -1,5 +1,5 @@
 {
     "require-dev": {
-        "21torr/php-cs-fixer": "^1.0.1"
+        "21torr/php-cs-fixer": "^1.0.2"
     }
 }