Skip to content

Commit 4d50b86

Browse files
committed
Mark classes as final
1 parent ba0798e commit 4d50b86

40 files changed

+36
-580
lines changed

lib/Doctrine/ODM/MongoDB/DocumentNotFoundException.php

+1-14
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@
44

55
namespace Doctrine\ODM\MongoDB;
66

7-
use Throwable;
8-
use const E_USER_DEPRECATED;
97
use function json_encode;
108
use function sprintf;
11-
use function trigger_error;
129

1310
/**
1411
* Class for exception when encountering proxy object that has
1512
* an identifier that does not exist in the database.
16-
*
17-
* @final
1813
*/
19-
class DocumentNotFoundException extends MongoDBException
14+
final class DocumentNotFoundException extends MongoDBException
2015
{
21-
public function __construct($message = '', $code = 0, ?Throwable $previous = null)
22-
{
23-
if (self::class !== static::class) {
24-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
25-
}
26-
parent::__construct($message, $code, $previous);
27-
}
28-
2916
public static function documentNotFound(string $className, $identifier) : self
3017
{
3118
return new self(sprintf(

lib/Doctrine/ODM/MongoDB/Event/DocumentNotFoundEventArgs.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
namespace Doctrine\ODM\MongoDB\Event;
66

77
use Doctrine\ODM\MongoDB\DocumentManager;
8-
use const E_USER_DEPRECATED;
9-
use function sprintf;
10-
use function trigger_error;
118

129
/**
1310
* Provides event arguments for the documentNotFound event.
14-
*
15-
* @final
1611
*/
17-
class DocumentNotFoundEventArgs extends LifecycleEventArgs
12+
final class DocumentNotFoundEventArgs extends LifecycleEventArgs
1813
{
1914
/** @var mixed */
2015
private $identifier;
@@ -27,9 +22,6 @@ class DocumentNotFoundEventArgs extends LifecycleEventArgs
2722
*/
2823
public function __construct(object $document, DocumentManager $dm, $identifier)
2924
{
30-
if (self::class !== static::class) {
31-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
32-
}
3325
parent::__construct($document, $dm);
3426
$this->identifier = $identifier;
3527
}

lib/Doctrine/ODM/MongoDB/Event/LoadClassMetadataEventArgs.php

+1-16
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,14 @@
55
namespace Doctrine\ODM\MongoDB\Event;
66

77
use Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs as BaseLoadClassMetadataEventArgs;
8-
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
9-
use Doctrine\Common\Persistence\ObjectManager;
108
use Doctrine\ODM\MongoDB\DocumentManager;
11-
use const E_USER_DEPRECATED;
129
use function assert;
13-
use function sprintf;
14-
use function trigger_error;
1510

1611
/**
1712
* Class that holds event arguments for a loadMetadata event.
18-
*
19-
* @final
2013
*/
21-
class LoadClassMetadataEventArgs extends BaseLoadClassMetadataEventArgs
14+
final class LoadClassMetadataEventArgs extends BaseLoadClassMetadataEventArgs
2215
{
23-
public function __construct(ClassMetadata $classMetadata, ObjectManager $objectManager)
24-
{
25-
if (self::class !== static::class) {
26-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
27-
}
28-
parent::__construct($classMetadata, $objectManager);
29-
}
30-
3116
public function getDocumentManager() : DocumentManager
3217
{
3318
$dm = $this->getObjectManager();

lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@
66

77
use Doctrine\ODM\MongoDB\DocumentManager;
88
use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
9-
use const E_USER_DEPRECATED;
10-
use function sprintf;
11-
use function trigger_error;
129

1310
/**
1411
* Class that holds event arguments for a `onClassMetadataNotFound` event.
1512
*
1613
* This object is mutable by design, allowing callbacks having access to it to set the
1714
* found metadata in it, and therefore "cancelling" a `onClassMetadataNotFound` event
18-
*
19-
* @final
2015
*/
21-
class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
16+
final class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
2217
{
2318
/** @var string */
2419
private $className;
@@ -28,9 +23,6 @@ class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
2823

2924
public function __construct(string $className, DocumentManager $dm)
3025
{
31-
if (self::class !== static::class) {
32-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
33-
}
3426
$this->className = $className;
3527

3628
parent::__construct($dm);

lib/Doctrine/ODM/MongoDB/Event/OnClearEventArgs.php

+1-14
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,13 @@
66

77
use Doctrine\Common\Persistence\Event\OnClearEventArgs as BaseOnClearEventArgs;
88
use Doctrine\ODM\MongoDB\DocumentManager;
9-
use const E_USER_DEPRECATED;
109
use function assert;
11-
use function sprintf;
12-
use function trigger_error;
1310

1411
/**
1512
* Provides event arguments for the onClear event.
16-
*
17-
* @final
1813
*/
19-
class OnClearEventArgs extends BaseOnClearEventArgs
14+
final class OnClearEventArgs extends BaseOnClearEventArgs
2015
{
21-
public function __construct($objectManager, $entityClass = null)
22-
{
23-
if (self::class !== static::class) {
24-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
25-
}
26-
parent::__construct($objectManager, $entityClass);
27-
}
28-
2916
public function getDocumentManager() : DocumentManager
3017
{
3118
$dm = $this->getObjectManager();

lib/Doctrine/ODM/MongoDB/Event/OnFlushEventArgs.php

+1-15
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@
44

55
namespace Doctrine\ODM\MongoDB\Event;
66

7-
use Doctrine\Common\Persistence\ObjectManager;
8-
use const E_USER_DEPRECATED;
9-
use function sprintf;
10-
use function trigger_error;
11-
127
/**
138
* Provides event arguments for the onFlush event.
14-
*
15-
* @final
169
*/
17-
class OnFlushEventArgs extends ManagerEventArgs
10+
final class OnFlushEventArgs extends ManagerEventArgs
1811
{
19-
public function __construct(ObjectManager $objectManager)
20-
{
21-
if (self::class !== static::class) {
22-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
23-
}
24-
parent::__construct($objectManager);
25-
}
2612
}

lib/Doctrine/ODM/MongoDB/Event/PostCollectionLoadEventArgs.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,17 @@
66

77
use Doctrine\ODM\MongoDB\DocumentManager;
88
use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface;
9-
use const E_USER_DEPRECATED;
10-
use function sprintf;
11-
use function trigger_error;
129

1310
/**
1411
* Class that holds arguments for postCollectionLoad event.
15-
*
16-
* @final
1712
*/
18-
class PostCollectionLoadEventArgs extends ManagerEventArgs
13+
final class PostCollectionLoadEventArgs extends ManagerEventArgs
1914
{
2015
/** @var PersistentCollectionInterface */
2116
private $collection;
2217

2318
public function __construct(PersistentCollectionInterface $collection, DocumentManager $dm)
2419
{
25-
if (self::class !== static::class) {
26-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
27-
}
2820
parent::__construct($dm);
2921
$this->collection = $collection;
3022
}

lib/Doctrine/ODM/MongoDB/Event/PostFlushEventArgs.php

+1-15
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@
44

55
namespace Doctrine\ODM\MongoDB\Event;
66

7-
use Doctrine\Common\Persistence\ObjectManager;
8-
use const E_USER_DEPRECATED;
9-
use function sprintf;
10-
use function trigger_error;
11-
127
/**
138
* Provides event arguments for the postFlush event.
14-
*
15-
* @final
169
*/
17-
class PostFlushEventArgs extends ManagerEventArgs
10+
final class PostFlushEventArgs extends ManagerEventArgs
1811
{
19-
public function __construct(ObjectManager $objectManager)
20-
{
21-
if (self::class !== static::class) {
22-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
23-
}
24-
parent::__construct($objectManager);
25-
}
2612
}

lib/Doctrine/ODM/MongoDB/Event/PreFlushEventArgs.php

+1-15
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@
44

55
namespace Doctrine\ODM\MongoDB\Event;
66

7-
use Doctrine\Common\Persistence\ObjectManager;
8-
use const E_USER_DEPRECATED;
9-
use function sprintf;
10-
use function trigger_error;
11-
127
/**
138
* Provides event arguments for the preFlush event.
14-
*
15-
* @final
169
*/
17-
class PreFlushEventArgs extends ManagerEventArgs
10+
final class PreFlushEventArgs extends ManagerEventArgs
1811
{
19-
public function __construct(ObjectManager $objectManager)
20-
{
21-
if (self::class !== static::class) {
22-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
23-
}
24-
parent::__construct($objectManager);
25-
}
2612
}

lib/Doctrine/ODM/MongoDB/Event/PreLoadEventArgs.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,17 @@
55
namespace Doctrine\ODM\MongoDB\Event;
66

77
use Doctrine\ODM\MongoDB\DocumentManager;
8-
use const E_USER_DEPRECATED;
9-
use function sprintf;
10-
use function trigger_error;
118

129
/**
1310
* Class that holds event arguments for a preLoad event.
14-
*
15-
* @final
1611
*/
17-
class PreLoadEventArgs extends LifecycleEventArgs
12+
final class PreLoadEventArgs extends LifecycleEventArgs
1813
{
1914
/** @var array */
2015
private $data;
2116

2217
public function __construct(object $document, DocumentManager $dm, array &$data)
2318
{
24-
if (self::class !== static::class) {
25-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
26-
}
2719
parent::__construct($document, $dm);
2820
$this->data =& $data;
2921
}

lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,19 @@
66

77
use Doctrine\ODM\MongoDB\DocumentManager;
88
use InvalidArgumentException;
9-
use const E_USER_DEPRECATED;
109
use function get_class;
1110
use function sprintf;
12-
use function trigger_error;
1311

1412
/**
1513
* Class that holds event arguments for a preUpdate event.
16-
*
17-
* @final
1814
*/
19-
class PreUpdateEventArgs extends LifecycleEventArgs
15+
final class PreUpdateEventArgs extends LifecycleEventArgs
2016
{
2117
/** @var array */
2218
private $documentChangeSet;
2319

2420
public function __construct(object $document, DocumentManager $dm, array $changeSet)
2521
{
26-
if (self::class !== static::class) {
27-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
28-
}
2922
parent::__construct($document, $dm);
3023
$this->documentChangeSet = $changeSet;
3124
}

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorException.php

+1-15
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,12 @@
55
namespace Doctrine\ODM\MongoDB\Hydrator;
66

77
use Doctrine\ODM\MongoDB\MongoDBException;
8-
use Throwable;
9-
use const E_USER_DEPRECATED;
10-
use function sprintf;
11-
use function trigger_error;
128

139
/**
1410
* MongoDB ODM Hydrator Exception
15-
*
16-
* @final
1711
*/
18-
class HydratorException extends MongoDBException
12+
final class HydratorException extends MongoDBException
1913
{
20-
public function __construct($message = '', $code = 0, ?Throwable $previous = null)
21-
{
22-
if (self::class !== static::class) {
23-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
24-
}
25-
parent::__construct($message, $code, $previous);
26-
}
27-
2814
public static function hydratorDirectoryNotWritable() : self
2915
{
3016
return new self('Your hydrator directory must be writable.');

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Doctrine\ODM\MongoDB\UnitOfWork;
1616
use ProxyManager\Proxy\GhostObjectInterface;
1717
use const DIRECTORY_SEPARATOR;
18-
use const E_USER_DEPRECATED;
1918
use function array_key_exists;
2019
use function chmod;
2120
use function class_exists;
@@ -31,16 +30,13 @@
3130
use function sprintf;
3231
use function str_replace;
3332
use function substr;
34-
use function trigger_error;
3533
use function uniqid;
3634

3735
/**
3836
* The HydratorFactory class is responsible for instantiating a correct hydrator
3937
* type based on document's ClassMetadata
40-
*
41-
* @final
4238
*/
43-
class HydratorFactory
39+
final class HydratorFactory
4440
{
4541
/**
4642
* The DocumentManager this factory is bound to.
@@ -96,9 +92,6 @@ class HydratorFactory
9692
*/
9793
public function __construct(DocumentManager $dm, EventManager $evm, ?string $hydratorDir, ?string $hydratorNs, int $autoGenerate)
9894
{
99-
if (self::class !== static::class) {
100-
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
101-
}
10295
if (! $hydratorDir) {
10396
throw HydratorException::hydratorDirectoryRequired();
10497
}

0 commit comments

Comments
 (0)