Merge 4.x into 5.x

sonata-project · Nov 4, 2021 · ad8d758 · ad8d758
2 parents 7b84784 + 3d23b30
commit ad8d758
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 124 deletions.
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -4,6 +4,17 @@ UPGRADE 3.x
 UPGRADE FROM 3.x to 3.x
 =======================
 
+### Mark final methods on abstract classes
+
+The following abstract classes have some of their methods marked as final with annotations, on 4.0 they will be final, make sure to not reimplement them:
+
+- `Sonata\MediaBundle\Admin\BaseMediaAdmin`
+- `Sonata\MediaBundle\Listener\BaseMediaEventSubscriber`
+- `Sonata\MediaBundle\Model\Gallery`
+- `Sonata\MediaBundle\Model\Media`
+- `Sonata\MediaBundle\Provider\BaseProvider`
+- `Sonata\MediaBundle\Provider\BaseVideoProvider`
+
 ### Deprecate PantherPortal CDN
 
 PantherPortal CDN no longer exists.

diff --git a/src/Admin/BaseMediaAdmin.php b/src/Admin/BaseMediaAdmin.php
@@ -141,7 +141,7 @@ public function alterNewInstance(object $object): void
         }
     }
 
-    public function getObjectMetadata(object $object): MetadataInterface
+    final public function getObjectMetadata(object $object): MetadataInterface
     {
         $provider = $this->pool->getProvider($object->getProviderName());
 

diff --git a/src/Listener/BaseMediaEventSubscriber.php b/src/Listener/BaseMediaEventSubscriber.php
@@ -28,7 +28,7 @@ public function __construct(Pool $pool)
         $this->pool = $pool;
     }
 
-    public function postUpdate(LifecycleEventArgs $args): void
+    final public function postUpdate(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -39,7 +39,7 @@ public function postUpdate(LifecycleEventArgs $args): void
         $this->getProvider($media)->postUpdate($media);
     }
 
-    public function postRemove(LifecycleEventArgs $args): void
+    final public function postRemove(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -50,7 +50,7 @@ public function postRemove(LifecycleEventArgs $args): void
         $this->getProvider($media)->postRemove($media);
     }
 
-    public function postPersist(LifecycleEventArgs $args): void
+    final public function postPersist(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -61,7 +61,7 @@ public function postPersist(LifecycleEventArgs $args): void
         $this->getProvider($media)->postPersist($media);
     }
 
-    public function preUpdate(LifecycleEventArgs $args): void
+    final public function preUpdate(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -77,7 +77,7 @@ public function preUpdate(LifecycleEventArgs $args): void
         $this->recomputeSingleEntityChangeSet($args);
     }
 
-    public function preRemove(LifecycleEventArgs $args): void
+    final public function preRemove(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -88,7 +88,7 @@ public function preRemove(LifecycleEventArgs $args): void
         $this->getProvider($media)->preRemove($media);
     }
 
-    public function prePersist(LifecycleEventArgs $args): void
+    final public function prePersist(LifecycleEventArgs $args): void
     {
         $media = $this->getMedia($args);
 
@@ -106,7 +106,7 @@ abstract protected function recomputeSingleEntityChangeSet(LifecycleEventArgs $a
 
     abstract protected function getMedia(LifecycleEventArgs $args): ?MediaInterface;
 
-    protected function getProvider(MediaInterface $media): MediaProviderInterface
+    final protected function getProvider(MediaInterface $media): MediaProviderInterface
     {
         return $this->pool->getProvider($media->getProviderName());
     }

diff --git a/src/Model/Gallery.php b/src/Model/Gallery.php
@@ -46,62 +46,62 @@ public function __toString(): string
         return $this->getName() ?? '-';
     }
 
-    public function setName(?string $name): void
+    final public function setName(?string $name): void
     {
         $this->name = $name;
     }
 
-    public function getName(): ?string
+    final public function getName(): ?string
     {
         return $this->name;
     }
 
-    public function setContext(?string $context): void
+    final public function setContext(?string $context): void
     {
         $this->context = $context;
     }
 
-    public function getContext(): ?string
+    final public function getContext(): ?string
     {
         return $this->context;
     }
 
-    public function setEnabled(bool $enabled): void
+    final public function setEnabled(bool $enabled): void
     {
         $this->enabled = $enabled;
     }
 
-    public function getEnabled(): bool
+    final public function getEnabled(): bool
     {
         return $this->enabled;
     }
 
-    public function setUpdatedAt(?\DateTimeInterface $updatedAt): void
+    final public function setUpdatedAt(?\DateTimeInterface $updatedAt): void
     {
         $this->updatedAt = $updatedAt;
     }
 
-    public function getUpdatedAt(): ?\DateTimeInterface
+    final public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
 
-    public function setCreatedAt(?\DateTimeInterface $createdAt): void
+    final public function setCreatedAt(?\DateTimeInterface $createdAt): void
     {
         $this->createdAt = $createdAt;
     }
 
-    public function getCreatedAt(): ?\DateTimeInterface
+    final public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
 
-    public function setDefaultFormat(string $defaultFormat): void
+    final public function setDefaultFormat(string $defaultFormat): void
     {
         $this->defaultFormat = $defaultFormat;
     }
 
-    public function getDefaultFormat(): string
+    final public function getDefaultFormat(): string
     {
         return $this->defaultFormat;
     }