doctrine · Majkl578 · Jun 8, 2016 · Jun 9, 2016 · Jun 10, 2016 · Jun 10, 2016
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ lib/api/
 lib/Doctrine/Common
 lib/Doctrine/DBAL
 /.settings/
+*.iml
 .buildpath
 .project
 .idea

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,159 @@
+# Upgrade to 3.0
+
+## BC Break: Removed `Doctrine\ORM\Version`
+
+The `Doctrine\ORM\Version` class is no longer available: please refrain from checking the ORM version at runtime.
+
+## BC Break: Removed `EntityManager#merge()` and `EntityManager#detach()` methods
+
+Merge and detach semantics were a poor fit for the PHP "share-nothing" architecture.
+In addition to that, merging/detaching caused multiple issues with data integrity
+in the managed entity graph, which was constantly spawning more edge-case bugs/scenarios.
+
+The following API methods were therefore removed:
+
+* `EntityManager#merge()`
+* `EntityManager#detach()`
+* `UnitOfWork#merge()`
+* `UnitOfWork#detach()`
+
+Users are encouraged to migrate `EntityManager#detach()` calls to `EntityManager#clear()`.
+
+In order to maintain performance on batch processing jobs, it is endorsed to enable
+the second level cache (http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/second-level-cache.html)
+on entities that are frequently reused across multiple `EntityManager#clear()` calls.
+
+An alternative to `EntityManager#merge()` is not provided by ORM 3.0, since the merging
+semantics should be part of the business domain rather than the persistence domain of an
+application. If your application relies heavily on CRUD-alike interactions and/or `PATCH`
+restful operations, you should look at alternatives such as [JMSSerializer](https://github.com/schmittjoh/serializer).
+
+## BC Break: Added the final keyword for  `EntityManager`
+
+Final keyword has been added to the ``EntityManager::class`` in order to ensure that EntityManager is not used as valid extension point. Valid extension point should be EntityManagerInterface.
+
+## BC Break: ``EntityManagerInterface`` is now used instead of ``EntityManager`` in typehints
+
+`Sequencing\Generator#generate()` now takes ``EntityManagerInterface`` as its first argument instead of ``EntityManager``. If you have any custom generators, please update your code accordingly.
+
+## BC Break: Removed `EntityManager#flush($entity)` and `EntityManager#flush($entities)`
+
+If your code relies on single entity flushing optimisations via
+`EntityManager#flush($entity)`, the signature has been changed to
+`EntityManager#flush()`.
+
+Said API was affected by multiple data integrity bugs due to the fact      
+that change tracking was being restricted upon a subset of the managed          
+entities. The ORM cannot support committing subsets of the managed 
+entities while also guaranteeing data integrity, therefore this
+utility was removed.
+
+The `flush()` semantics remain the same, but the change tracking will be performed
+on all entities managed by the unit of work, and not just on the provided
+`$entity` or `$entities`, as the parameter is now completely ignored.
+
+The same applies to `UnitOfWork#commit($entity)`, which now is simply
+`UnitOfWork#commit()`.
+
+If you would still like to perform batching operations over small `UnitOfWork`
+instances, it is suggested to follow these paths instead:
+
+ * eagerly use `EntityManager#clear()` in conjunction with a specific second level
+   cache configuration (see http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/second-level-cache.html)
+ * use an explicit change tracking policy (see http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/change-tracking-policies.html)
+
+## BC Break: Removed ``YAML`` mapping drivers.
+
+If your code relies on ``YamlDriver``  or ``SimpleYamlDriver``, you **MUST** change to
+annotation or XML drivers instead.
+
+## BC Break: Changed methods in ``ClassMetadata``
+
+* ``ClassMetadata::addInheritedProperty``
+* ``ClassMetadata::setDiscriminatorColumn``
+
+## BC Break: Removed methods in ``ClassMetadata``
+
+* ``ClassMetadata::getTypeOfField`` (to be removed, part of Common API)
+
+## BC Break: Removed methods in ``ClassMetadata``
+
+* ``ClassMetadata::setTableName`` => Use ``ClassMetadata::setPrimaryTable(['name' => ...])``
+* ``ClassMetadata::getFieldMapping`` => Use ``ClassMetadata::getProperty()`` and its methods
+* ``ClassMetadata::getQuotedColumnName`` => Use ``ClassMetadata::getProperty()::getQuotedColumnName()``
+* ``ClassMetadata::getQuotedTableName``
+* ``ClassMetadata::getQuotedJoinTableName``
+* ``ClassMetadata::getQuotedIdentifierColumnNames``
+* ``ClassMetadata::getIdentifierColumnNames`` => Use ``ClassMetadata::getIdentifierColumns($entityManager)``
+* ``ClassMetadata::setVersionMetadata``
+* ``ClassMetadata::setVersioned``
+* ``ClassMetadata::invokeLifecycleCallbacks``
+* ``ClassMetadata::isInheritedField`` => Use ``ClassMetadata::getProperty()::isInherited()``
+* ``ClassMetadata::isUniqueField`` => Use ``ClassMetadata::getProperty()::isUnique()``
+* ``ClassMetadata::isNullable`` => Use ``ClassMetadata::getProperty()::isNullable()``
+* ``ClassMetadata::getTypeOfColumn()`` => Use ``PersisterHelper::getTypeOfColumn()``
+
+## BC Break: Removed ``quoted`` index from table, field and sequence mappings
+
+Quoting is now always called. Implement your own ``Doctrine\ORM\Mapping\NamingStrategy`` to manipulate
+your schema, tables and column names to your custom desired naming convention.
+
+## BC Break: Removed ``ClassMetadata::$fieldMappings[$fieldName]['requireSQLConversion']``
+
+ORM Type SQL conversion is now always being applied, minimizing the risks of error prone code in ORM internals
+
+## BC Break: Removed ``ClassMetadata::$columnNames``
+
+If your code relies on this property, you should search/replace from this:
+
+    $metadata->columnNames[$fieldName]
+
+To this:
+
+    $metadata->getProperty($fieldName)->getColumnName()
+
+## BC Break: Renamed ``ClassMetadata::setIdentifierValues()`` to ``ClassMetadata::assignIdentifier()``
+
+Provides a more meaningful name to method.
+
+## BC Break: Removed ``ClassMetadata::$namespace``
+
+The namespace property in ClassMetadata was only used when using association 
+classes in the same namespace and it was used to speedup ClassMetadata 
+creation purposes. Namespace could be easily inferred by asking ``\ReflectionClass``
+which was already stored internally.
+
+### BC Break: Removed ``ClassMetadata::$isVersioned``
+
+Switched to a method alternative: ``ClassMetadata::isVersioned()``
+
+## BC Break: Removed ``Doctrine\ORM\Mapping\ClassMetadataInfo``
+
+There was no reason to keep a blank class. All references are now pointing
+to ``Doctrine\ORM\Mapping\ClassMetadata``. 
+
+## BC Break: Annotations classes namespace change
+
+All Annotations classes got moved from ``Doctrine\ORM\Mapping`` into a more 
+pertinent namespace ``Doctrine\ORM\Annotation``. This change was done to add
+room for Metadata namespace refactoring.
+
+## Minor BC break: Mappings now store DBAL\Type instances instead of strings
+
+This lead to manual ``ResultSetMapping`` building instances to also hold Types in meta results.
+Example:
+
+    $rsm->addMetaResult('e ', 'e_discr', 'discr', false, Type::getType('string'));
+
+## Enhancement: Mappings now store their declaring ClassMetadata
+
+Every field, association or embedded now contains a pointer to its declaring ClassMetadata.
+
+## Enhancement: Mappings now store their corresponding table name
+
+Every field, association join column or inline embedded field/association holds a reference to its owning table name.
+
+
 # Upgrade to 2.6
 
 ## Minor BC BREAK: `Doctrine\ORM\Tools\Console\ConsoleRunner` is now final
@@ -21,6 +177,7 @@ Method `Doctrine\ORM\Query\Parser#overwriteInternalDQLFunctionNotAllowed` was
 removed because of the choice to allow users to overwrite internal functions, ie
 `AVG`, `SUM`, `COUNT`, `MIN` and `MAX`. [#6500](https://github.com/doctrine/doctrine2/pull/6500)
 
+
 # Upgrade to 2.5
 
 ## Minor BC BREAK: removed `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()`
@@ -180,6 +337,7 @@ From now on, the resultset will look like this:
 
 Added way to access the underlying QueryBuilder#from() method's 'indexBy' parameter when using EntityRepository#createQueryBuilder()
 
+
 # Upgrade to 2.4
 
 ## BC BREAK: Compatibility Bugfix in PersistentCollection#matching()
@@ -224,6 +382,7 @@ Now parenthesis are considered, the previous DQL will generate:
 
     SELECT 100 / (2 * 2) FROM my_entity
 
+
 # Upgrade to 2.3
 
 ## Auto Discriminator Map breaks userland implementations with Listener
@@ -293,6 +452,7 @@ Also, following mapping drivers have been deprecated, please use their replaceme
  *  `Doctrine\ORM\Mapping\Driver\PHPDriver`         => `Doctrine\Common\Persistence\Mapping\Driver\PHPDriver`
  *  `Doctrine\ORM\Mapping\Driver\StaticPHPDriver`   => `Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver`
 
+
 # Upgrade to 2.2
 
 ## ResultCache implementation rewritten
@@ -376,6 +536,7 @@ Also, Doctrine 2.2 now is around 10-15% faster than 2.1.
 
 Previously EntityManager#find(null) returned null. It now throws an exception.
 
+
 # Upgrade to 2.1
 
 ## Interface for EntityRepository
@@ -400,6 +561,7 @@ The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory
 
 This is already done inside the ``$config->newDefaultAnnotationDriver``, so everything should automatically work if you are using this method. You can verify if everything still works by executing a console command such as schema-validate that loads all metadata into memory.
 
+
 # Update from 2.0-BETA3 to 2.0-BETA4
 
 ## XML Driver <change-tracking-policy /> element demoted to attribute
@@ -408,6 +570,7 @@ We changed how the XML Driver allows to define the change-tracking-policy. The w
 
     <entity change-tracking-policy="DEFERRED_IMPLICT" />
 
+
 # Update from 2.0-BETA2 to 2.0-BETA3
 
 ## Serialization of Uninitialized Proxies
@@ -470,10 +633,12 @@ don't loose anything through this.
 The default allocation size for sequences has been changed from 10 to 1. This step was made
 to not cause confusion with users and also because it is partly some kind of premature optimization.
 
+
 # Update from 2.0-BETA1 to 2.0-BETA2
 
 There are no backwards incompatible changes in this release.
 
+
 # Upgrade from 2.0-ALPHA4 to 2.0-BETA1
 
 ## EntityRepository deprecates access to protected variables
@@ -544,7 +709,6 @@ access all entities.
 
 Xml and Yaml Drivers work as before!
 
-
 ## New inversedBy attribute
 
 It is now *mandatory* that the owning side of a bidirectional association specifies the
@@ -608,7 +772,7 @@ you need to use the following, explicit syntax:
 ## XML Mapping Driver
 
 The 'inheritance-type' attribute changed to take last bit of ClassMetadata constant names, i.e.
-NONE, SINGLE_TABLE, INHERITANCE_TYPE_JOINED
+NONE, SINGLE_TABLE, JOINED
 
 ## YAML Mapping Driver
 
@@ -640,6 +804,7 @@ The Collection interface in the Common package has been updated with some missin
 that were present only on the default implementation, ArrayCollection. Custom collection
 implementations need to be updated to adhere to the updated interface.
 
+
 # Upgrade from 2.0-ALPHA3 to 2.0-ALPHA4
 
 ## CLI Controller changes
@@ -676,6 +841,8 @@ With new required method AbstractTask::buildDocumentation, its implementation de
     database schema without deleting any unused tables, sequences or foreign keys.
     * Use "doctrine schema-tool --complete-update" to do a full incremental update of
     your schema.
+
+
 # Upgrade from 2.0-ALPHA2 to 2.0-ALPHA3
 
 This section details the changes made to Doctrine 2.0-ALPHA3 to make it easier for you

diff --git a/bin/doctrine b/bin/doctrine
@@ -1,4 +1,6 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types=1);
+
 include('doctrine.php');
diff --git a/bin/doctrine-pear.php b/bin/doctrine-pear.php
@@ -1,21 +1,7 @@
 <?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.doctrine-project.org>.
- */
+
+
+declare(strict_types=1);
 
 require_once 'Doctrine/Common/ClassLoader.php';
 

diff --git a/bin/doctrine.php b/bin/doctrine.php
@@ -1,21 +1,6 @@
 <?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
+
+declare(strict_types=1);
 
 use Symfony\Component\Console\Helper\HelperSet;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;

diff --git a/build.properties b/build.properties
@@ -1,3 +0,0 @@
-# Version class and file
-project.version_class = Doctrine\\ORM\\Version
-project.version_file = lib/Doctrine/ORM/Version.php

diff --git a/build.xml b/build.xml
@@ -38,29 +38,6 @@
         </exec>
     </target>
 
-    <target name="make-release" depends="check-git-checkout-clean,prepare,php">
-        <replace file="${project.version_file}" token="-DEV" value="" failOnNoReplacements="true" />
-        <exec executable="${php_executable}" outputproperty="doctrine.current_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="require_once '${project.version_file}';echo ${project.version_class}::VERSION;" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.next_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="$parts = explode('.', str_ireplace(array('-DEV', '-ALPHA', '-BETA'), '', '${doctrine.current_version}'));
-                if (count($parts) != 3) {
-                    throw new \InvalidArgumentException('Version is assumed in format x.y.z, ${doctrine.current_version} given');
-                }
-                $parts[2]++;
-                echo implode('.', $parts);
-            " />
-        </exec>
-
-        <git-commit file="${project.version_file}" message="Release ${doctrine.current_version}" />
-        <git-tag version="${doctrine.current_version}" />
-        <replace file="${project.version_file}" token="${doctrine.current_version}" value="${doctrine.next_version}-DEV" />
-        <git-commit file="${project.version_file}" message="Bump version to ${doctrine.next_version}" />
-    </target>
-
     <target name="check-git-checkout-clean">
         <exec executable="git" failonerror="true">
             <arg value="diff-index" />

diff --git a/composer.json b/composer.json
@@ -17,20 +17,17 @@
         "php": "^7.1",
         "ext-pdo": "*",
         "doctrine/collections": "^1.4",
-        "doctrine/dbal": ">=2.5-dev,<2.7-dev",
+        "doctrine/dbal": "dev-develop as 3.x-dev",
         "doctrine/instantiator": "~1.1",
         "doctrine/common": "^2.7.1",
         "doctrine/cache": "~1.6",
         "doctrine/annotations": "~1.4",
+        "ocramius/package-versions": "^1.1.2",
         "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "symfony/yaml": "~3.0|~4.0",
         "phpunit/phpunit": "^6.0"
     },
-    "suggest": {
-        "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
-    },
     "autoload": {
         "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" }
     },
@@ -43,7 +40,7 @@
     "bin": ["bin/doctrine"],
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     },
     "archive": {