Fixes after rebase

Author: guilhermeblanco

docs/en/cookbook/dql-custom-walkers.rst

@@ -130,7 +130,7 @@ implementation is:
         {
             $parent = null;
             $parentName = null;
-            foreach ($this->_getQueryComponents() as $dqlAlias => $qComp) {
+            foreach ($this->getQueryComponents() as $dqlAlias => $qComp) {
                 if ($qComp['parent'] === null && $qComp['nestingLevel'] == 0) {
                     $parent = $qComp;
                     $parentName = $dqlAlias;

docs/en/reference/batch-processing.rst

@@ -168,13 +168,13 @@ problems using the following approach:
 .. code-block:: php
 
     <?php
-    $q = $this->_em->createQuery('select u from MyProject\Model\User u');
+    $q = $this->em->createQuery('select u from MyProject\Model\User u');
     $iterableResult = $q->iterate();
     foreach ($iterableResult as $row) {
         // do stuff with the data in the row, $row[0] is always the object
     
         // detach all entities from Doctrine, so that Garbage-Collection can kick in immediately
-        $this->_em->clear();
+        $this->em->clear();
     }
 
 .. note::

docs/en/reference/change-tracking-policies.rst

@@ -82,11 +82,11 @@ follows:
     {
         // ...
     
-        private $_listeners = array();
+        private $listeners = array();
     
         public function addPropertyChangedListener(PropertyChangedListener $listener)
         {
-            $this->_listeners[] = $listener;
+            $this->listeners[] = $listener;
         }
     }
 
@@ -104,10 +104,10 @@ behaviour:
     {
         // ...
     
-        protected function _onPropertyChanged($propName, $oldValue, $newValue)
+        protected function onPropertyChanged($propName, $oldValue, $newValue)
         {
-            if ($this->_listeners) {
-                foreach ($this->_listeners as $listener) {
+            if ($this->listeners) {
+                foreach ($this->listeners as $listener) {
                     $listener->propertyChanged($this, $propName, $oldValue, $newValue);
                 }
             }
@@ -116,13 +116,13 @@ behaviour:
         public function setData($data)
         {
             if ($data != $this->data) {
-                $this->_onPropertyChanged('data', $this->data, $data);
+                $this->onPropertyChanged('data', $this->data, $data);
                 $this->data = $data;
             }
         }
     }
 
-You have to invoke ``_onPropertyChanged`` inside every method that
+You have to invoke ``onPropertyChanged`` inside every method that
 changes the persistent state of ``MyEntity``.
 
 The check whether the new value is different from the old one is

docs/en/reference/dql-doctrine-query-language.rst

@@ -1253,7 +1253,7 @@ creating a class which extends ``AbstractHydrator``:
     {
         protected function _hydrateAll()
         {
-            return $this->_stmt->fetchAll(PDO::FETCH_ASSOC);
+            return $this->stmt->fetchAll(PDO::FETCH_ASSOC);
         }
     }
 

docs/en/reference/metadata-drivers.rst

@@ -102,22 +102,22 @@ the ``AbstractFileDriver`` implementation for you to extend from:
         /**
          * {@inheritdoc}
          */
-        protected $_fileExtension = '.dcm.ext';
+        protected $fileExtension = '.dcm.ext';
     
         /**
          * {@inheritdoc}
          */
         public function loadMetadataForClass($className, ClassMetadata $metadata)
         {
-            $data = $this->_loadMappingFile($file);
+            $data = $this->loadMappingFile($file);
     
             // populate ClassMetadata instance from $data
         }
     
         /**
          * {@inheritdoc}
          */
-        protected function _loadMappingFile($file)
+        protected function loadMappingFile($file)
         {
             // parse contents of $file and return php data structure
         }

docs/en/reference/native-sql.rst

@@ -323,7 +323,7 @@ entity.
     $rsm->addFieldResult('u', 'id', 'id');
     $rsm->addFieldResult('u', 'name', 'name');
     
-    $query = $this->_em->createNativeQuery('SELECT id, name FROM users WHERE name = ?', $rsm);
+    $query = $this->em->createNativeQuery('SELECT id, name FROM users WHERE name = ?', $rsm);
     $query->setParameter(1, 'romanb');
     
     $users = $query->getResult();
@@ -359,7 +359,7 @@ thus owns the foreign key.
     $rsm->addFieldResult('u', 'name', 'name');
     $rsm->addMetaResult('u', 'address_id', 'address_id');
     
-    $query = $this->_em->createNativeQuery('SELECT id, name, address_id FROM users WHERE name = ?', $rsm);
+    $query = $this->em->createNativeQuery('SELECT id, name, address_id FROM users WHERE name = ?', $rsm);
     $query->setParameter(1, 'romanb');
     
     $users = $query->getResult();
@@ -390,7 +390,7 @@ associations that are lazy.
     
     $sql = 'SELECT u.id, u.name, a.id AS address_id, a.street, a.city FROM users u ' .
            'INNER JOIN address a ON u.address_id = a.id WHERE u.name = ?';
-    $query = $this->_em->createNativeQuery($sql, $rsm);
+    $query = $this->em->createNativeQuery($sql, $rsm);
     $query->setParameter(1, 'romanb');
     
     $users = $query->getResult();
@@ -423,7 +423,7 @@ to map the hierarchy (both use a discriminator column).
     $rsm->addMetaResult('u', 'discr', 'discr'); // discriminator column
     $rsm->setDiscriminatorColumn('u', 'discr');
     
-    $query = $this->_em->createNativeQuery('SELECT id, name, discr FROM users WHERE name = ?', $rsm);
+    $query = $this->em->createNativeQuery('SELECT id, name, discr FROM users WHERE name = ?', $rsm);
     $query->setParameter(1, 'romanb');
     
     $users = $query->getResult();

docs/en/reference/second-level-cache.rst

@@ -590,7 +590,7 @@ Execute the ``UPDATE`` and invalidate ``all cache entries`` using ``Query::HINT_
 
     <?php
     // Execute and invalidate
-    $this->_em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
+    $this->em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
         ->setHint(Query::HINT_CACHE_EVICT, true)
         ->execute();
 
@@ -601,7 +601,7 @@ Execute the ``UPDATE`` and invalidate ``all cache entries`` using the cache API
 
     <?php
     // Execute
-    $this->_em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
+    $this->em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
         ->execute();
     // Invoke Cache API
     $em->getCache()->evictEntityRegion('Entity\Country');
@@ -613,7 +613,7 @@ Execute the ``UPDATE`` and invalidate ``a specific cache entry`` using the cache
 
     <?php
     // Execute
-    $this->_em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
+    $this->em->createQuery("UPDATE Entity\Country u SET u.name = 'unknown' WHERE u.id = 1")
         ->execute();
     // Invoke Cache API
     $em->getCache()->evictEntity('Entity\Country', 1);

docs/en/reference/working-with-objects.rst

@@ -749,7 +749,7 @@ in a central location.
     {
         public function getAllAdminUsers()
         {
-            return $this->_em->createQuery('SELECT u FROM MyDomain\Model\User u WHERE u.status = "admin"')
+            return $this->em->createQuery('SELECT u FROM MyDomain\Model\User u WHERE u.status = "admin"')
                              ->getResult();
         }
     }

lib/Doctrine/ORM/EntityManager.php

@@ -229,7 +229,7 @@ public function transactional(callable $func)
             $this->flush();
             $this->conn->commit();
 
-            return $return ?: true;
+            return $return;
         } catch (\Throwable $e) {
             $this->close();
             $this->conn->rollBack();

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -126,7 +126,7 @@ public function hydrateAll($stmt, $resultSetMapping, array $hints = [])
         $this->rsm   = $resultSetMapping;
         $this->hints = $hints;
 
-        $this->_em->getEventManager()->addEventListener([Events::onClear], $this);
+        $this->em->getEventManager()->addEventListener([Events::onClear], $this);
 
         $this->prepare();
 
@@ -379,7 +379,7 @@ protected function hydrateColumnInfo($key)
 
                 // the current discriminator value must be saved in order to disambiguate fields hydration,
                 // should there be field name collisions
-                if ($classMetadata->parentClasses && isset($this->rsm->discriminatorColumns[$ownerMap])) {
+                if ($classMetadata->getParent() && isset($this->rsm->discriminatorColumns[$ownerMap])) {
                     return $this->cache[$key] = \array_merge(
                         $columnInfo,
                         [