comparison vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)

      * @throws \BadMethodCallException   When no persistent field exists by that name.
      * @throws \InvalidArgumentException When the wrong target object type is passed to an association.
      */
     private function set($field, $args)
     {
-        $this->initializeDoctrine();
-
         if ($this->cm->hasField($field) && !$this->cm->isIdentifier($field)) {
             $this->$field = $args[0];
         } else if ($this->cm->hasAssociation($field) && $this->cm->isSingleValuedAssociation($field)) {
             $targetClass = $this->cm->getAssociationTargetClass($field);
             if (!($args[0] instanceof $targetClass) && $args[0] !== null) {

      *
      * @throws \BadMethodCallException When no persistent field exists by that name.
      */
     private function get($field)
     {
-        $this->initializeDoctrine();
-
         if ( $this->cm->hasField($field) || $this->cm->hasAssociation($field) ) {
             return $this->$field;
-        } else {
-            throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
-        }
+        }
+
+        throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
     }
 
     /**
      * If this is an inverse side association, completes the owning side.
      *

      * @throws \BadMethodCallException
      * @throws \InvalidArgumentException
      */
     private function add($field, $args)
     {
-        $this->initializeDoctrine();
-
         if ($this->cm->hasAssociation($field) && $this->cm->isCollectionValuedAssociation($field)) {
             $targetClass = $this->cm->getAssociationTargetClass($field);
             if (!($args[0] instanceof $targetClass)) {
                 throw new \InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
             }

      *
      * @throws \BadMethodCallException
      */
     public function __call($method, $args)
     {
+        $this->initializeDoctrine();
+
         $command = substr($method, 0, 3);
         $field = lcfirst(substr($method, 3));
         if ($command == "set") {
             $this->set($field, $args);
         } else if ($command == "get") {