Skip to content

Commit

Permalink
Merge 06584f3 into ba0798e
Browse files Browse the repository at this point in the history
  • Loading branch information
@malarzm
malarzm committed Apr 16, 2019
2 parents ba0798e + 06584f3 commit efb4902
Show file tree
Hide file tree
Showing 44 changed files with 101 additions and 741 deletions.
15 changes: 1 addition & 14 deletions lib/Doctrine/ODM/MongoDB/DocumentNotFoundException.php
View file
Expand Up @@ -4,28 +4,15 @@

namespace Doctrine\ODM\MongoDB;

use Throwable;
use const E_USER_DEPRECATED;
use function json_encode;
use function sprintf;
use function trigger_error;

/**
* Class for exception when encountering proxy object that has
* an identifier that does not exist in the database.
*
* @final
*/
class DocumentNotFoundException extends MongoDBException
final class DocumentNotFoundException extends MongoDBException
{
public function __construct($message = '', $code = 0, ?Throwable $previous = null)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($message, $code, $previous);
}

public static function documentNotFound(string $className, $identifier) : self
{
return new self(sprintf(
Expand Down
10 changes: 1 addition & 9 deletions lib/Doctrine/ODM/MongoDB/Event/DocumentNotFoundEventArgs.php
View file
Expand Up @@ -5,16 +5,11 @@
namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\ODM\MongoDB\DocumentManager;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Provides event arguments for the documentNotFound event.
*
* @final
*/
class DocumentNotFoundEventArgs extends LifecycleEventArgs
final class DocumentNotFoundEventArgs extends LifecycleEventArgs
{
/** @var mixed */
private $identifier;
Expand All @@ -27,9 +22,6 @@ class DocumentNotFoundEventArgs extends LifecycleEventArgs
*/
public function __construct(object $document, DocumentManager $dm, $identifier)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($document, $dm);
$this->identifier = $identifier;
}
Expand Down
17 changes: 1 addition & 16 deletions lib/Doctrine/ODM/MongoDB/Event/LoadClassMetadataEventArgs.php
View file
Expand Up @@ -5,29 +5,14 @@
namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs as BaseLoadClassMetadataEventArgs;
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\ODM\MongoDB\DocumentManager;
use const E_USER_DEPRECATED;
use function assert;
use function sprintf;
use function trigger_error;

/**
* Class that holds event arguments for a loadMetadata event.
*
* @final
*/
class LoadClassMetadataEventArgs extends BaseLoadClassMetadataEventArgs
final class LoadClassMetadataEventArgs extends BaseLoadClassMetadataEventArgs
{
public function __construct(ClassMetadata $classMetadata, ObjectManager $objectManager)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($classMetadata, $objectManager);
}

public function getDocumentManager() : DocumentManager
{
$dm = $this->getObjectManager();
Expand Down
10 changes: 1 addition & 9 deletions lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php
View file
Expand Up @@ -6,19 +6,14 @@

use Doctrine\ODM\MongoDB\DocumentManager;
use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Class that holds event arguments for a `onClassMetadataNotFound` event.
*
* This object is mutable by design, allowing callbacks having access to it to set the
* found metadata in it, and therefore "cancelling" a `onClassMetadataNotFound` event
*
* @final
*/
class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
final class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
{
/** @var string */
private $className;
Expand All @@ -28,9 +23,6 @@ class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs

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

parent::__construct($dm);
Expand Down
15 changes: 1 addition & 14 deletions lib/Doctrine/ODM/MongoDB/Event/OnClearEventArgs.php
View file
Expand Up @@ -6,26 +6,13 @@

use Doctrine\Common\Persistence\Event\OnClearEventArgs as BaseOnClearEventArgs;
use Doctrine\ODM\MongoDB\DocumentManager;
use const E_USER_DEPRECATED;
use function assert;
use function sprintf;
use function trigger_error;

/**
* Provides event arguments for the onClear event.
*
* @final
*/
class OnClearEventArgs extends BaseOnClearEventArgs
final class OnClearEventArgs extends BaseOnClearEventArgs
{
public function __construct($objectManager, $entityClass = null)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($objectManager, $entityClass);
}

public function getDocumentManager() : DocumentManager
{
$dm = $this->getObjectManager();
Expand Down
16 changes: 1 addition & 15 deletions lib/Doctrine/ODM/MongoDB/Event/OnFlushEventArgs.php
View file
Expand Up @@ -4,23 +4,9 @@

namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\Common\Persistence\ObjectManager;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Provides event arguments for the onFlush event.
*
* @final
*/
class OnFlushEventArgs extends ManagerEventArgs
final class OnFlushEventArgs extends ManagerEventArgs
{
public function __construct(ObjectManager $objectManager)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($objectManager);
}
}
10 changes: 1 addition & 9 deletions lib/Doctrine/ODM/MongoDB/Event/PostCollectionLoadEventArgs.php
View file
Expand Up @@ -6,25 +6,17 @@

use Doctrine\ODM\MongoDB\DocumentManager;
use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Class that holds arguments for postCollectionLoad event.
*
* @final
*/
class PostCollectionLoadEventArgs extends ManagerEventArgs
final class PostCollectionLoadEventArgs extends ManagerEventArgs
{
/** @var PersistentCollectionInterface */
private $collection;

public function __construct(PersistentCollectionInterface $collection, DocumentManager $dm)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($dm);
$this->collection = $collection;
}
Expand Down
16 changes: 1 addition & 15 deletions lib/Doctrine/ODM/MongoDB/Event/PostFlushEventArgs.php
View file
Expand Up @@ -4,23 +4,9 @@

namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\Common\Persistence\ObjectManager;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Provides event arguments for the postFlush event.
*
* @final
*/
class PostFlushEventArgs extends ManagerEventArgs
final class PostFlushEventArgs extends ManagerEventArgs
{
public function __construct(ObjectManager $objectManager)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($objectManager);
}
}
16 changes: 1 addition & 15 deletions lib/Doctrine/ODM/MongoDB/Event/PreFlushEventArgs.php
View file
Expand Up @@ -4,23 +4,9 @@

namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\Common\Persistence\ObjectManager;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Provides event arguments for the preFlush event.
*
* @final
*/
class PreFlushEventArgs extends ManagerEventArgs
final class PreFlushEventArgs extends ManagerEventArgs
{
public function __construct(ObjectManager $objectManager)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($objectManager);
}
}
10 changes: 1 addition & 9 deletions lib/Doctrine/ODM/MongoDB/Event/PreLoadEventArgs.php
View file
Expand Up @@ -5,25 +5,17 @@
namespace Doctrine\ODM\MongoDB\Event;

use Doctrine\ODM\MongoDB\DocumentManager;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* Class that holds event arguments for a preLoad event.
*
* @final
*/
class PreLoadEventArgs extends LifecycleEventArgs
final class PreLoadEventArgs extends LifecycleEventArgs
{
/** @var array */
private $data;

public function __construct(object $document, DocumentManager $dm, array &$data)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($document, $dm);
$this->data =& $data;
}
Expand Down
9 changes: 1 addition & 8 deletions lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php
View file
Expand Up @@ -6,26 +6,19 @@

use Doctrine\ODM\MongoDB\DocumentManager;
use InvalidArgumentException;
use const E_USER_DEPRECATED;
use function get_class;
use function sprintf;
use function trigger_error;

/**
* Class that holds event arguments for a preUpdate event.
*
* @final
*/
class PreUpdateEventArgs extends LifecycleEventArgs
final class PreUpdateEventArgs extends LifecycleEventArgs
{
/** @var array */
private $documentChangeSet;

public function __construct(object $document, DocumentManager $dm, array $changeSet)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($document, $dm);
$this->documentChangeSet = $changeSet;
}
Expand Down
16 changes: 1 addition & 15 deletions lib/Doctrine/ODM/MongoDB/Hydrator/HydratorException.php
View file
Expand Up @@ -5,26 +5,12 @@
namespace Doctrine\ODM\MongoDB\Hydrator;

use Doctrine\ODM\MongoDB\MongoDBException;
use Throwable;
use const E_USER_DEPRECATED;
use function sprintf;
use function trigger_error;

/**
* MongoDB ODM Hydrator Exception
*
* @final
*/
class HydratorException extends MongoDBException
final class HydratorException extends MongoDBException
{
public function __construct($message = '', $code = 0, ?Throwable $previous = null)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
parent::__construct($message, $code, $previous);
}

public static function hydratorDirectoryNotWritable() : self
{
return new self('Your hydrator directory must be writable.');
Expand Down
9 changes: 1 addition & 8 deletions lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
View file
Expand Up @@ -15,7 +15,6 @@
use Doctrine\ODM\MongoDB\UnitOfWork;
use ProxyManager\Proxy\GhostObjectInterface;
use const DIRECTORY_SEPARATOR;
use const E_USER_DEPRECATED;
use function array_key_exists;
use function chmod;
use function class_exists;
Expand All @@ -31,16 +30,13 @@
use function sprintf;
use function str_replace;
use function substr;
use function trigger_error;
use function uniqid;

/**
* The HydratorFactory class is responsible for instantiating a correct hydrator
* type based on document's ClassMetadata
*
* @final
*/
class HydratorFactory
final class HydratorFactory
{
/**
* The DocumentManager this factory is bound to.
Expand Down Expand Up @@ -96,9 +92,6 @@ class HydratorFactory
*/
public function __construct(DocumentManager $dm, EventManager $evm, ?string $hydratorDir, ?string $hydratorNs, int $autoGenerate)
{
if (self::class !== static::class) {
@trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
}
if (! $hydratorDir) {
throw HydratorException::hydratorDirectoryRequired();
}
Expand Down

0 comments on commit efb4902

Please sign in to comment.