Merge pull request #34 from darkwebdesign/ISSUE-32

ISSUE-32: Update package for Doctrine 2.7

Author: raymondschouten

README.md

@@ -4,9 +4,9 @@
 [![Total Downloads](https://poser.pugx.org/darkwebdesign/doctrine-unit-testing/downloads?format=flat)](https://packagist.org/packages/darkwebdesign/doctrine-unit-testing)
 [![License](https://poser.pugx.org/darkwebdesign/doctrine-unit-testing/license?format=flat)](https://packagist.org/packages/darkwebdesign/doctrine-unit-testing)
 
-[![Build Status](https://travis-ci.org/darkwebdesign/doctrine-unit-testing.svg?branch=2.6)](https://travis-ci.org/darkwebdesign/doctrine-unit-testing?branch=2.6)
+[![Build Status](https://travis-ci.org/darkwebdesign/doctrine-unit-testing.svg?branch=2.7)](https://travis-ci.org/darkwebdesign/doctrine-unit-testing?branch=2.7)
 [![PHP Version](https://img.shields.io/badge/php-7.1%2B-777BB3.svg)](https://php.net/)
-[![Doctrine Version](https://img.shields.io/badge/doctrine-2.6-2E6BC8.svg)](http://www.doctrine-project.org/)
+[![Doctrine Version](https://img.shields.io/badge/doctrine-2.7-2E6BC8.svg)](http://www.doctrine-project.org/)
 
 Doctrine Unit Testing makes the Doctrine internal test case classes available to use in your own projects
 unit tests.

composer.json

@@ -9,8 +9,8 @@
         {"name": "Raymond Schouten"}
     ],
     "require": {
-        "doctrine/orm": "^2.6",
-        "php": ">=7.1"
+        "doctrine/orm": "^2.7",
+        "php": "^7.1"
     },
     "autoload": {
         "psr-4": {

src/EventListener/CacheMetadataListener.php

@@ -28,7 +28,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event)
         $em = $event->getObjectManager();
 
         /** @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
-        if (strstr($metadata->name, 'Doctrine\Tests\Models\Cache')) {
+        if (strstr($metadata->name, 'DarkWebDesign\DoctrineUnitTesting\Models\Cache')) {
             return;
         }
 

src/Mapping/UnderscoreNamingStrategyTest.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DarkWebDesign\DoctrineUnitTesting\Mapping;
+
+use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
+use DarkWebDesign\DoctrineUnitTesting\VerifyDeprecations;
+use PHPUnit\Framework\TestCase;
+use const CASE_LOWER;
+
+final class UnderscoreNamingStrategyTest extends TestCase
+{
+    use VerifyDeprecations;
+
+    /** @test */
+    public function checkDeprecationMessage() : void
+    {
+        $this->expectDeprecationMessage('Creating Doctrine\ORM\Mapping\UnderscoreNamingStrategy without making it number aware is deprecated and will be removed in Doctrine ORM 3.0.');
+        new UnderscoreNamingStrategy(CASE_LOWER, false);
+    }
+}

src/Mocks/EntityManagerMock.php

@@ -71,7 +71,7 @@ public static function create($conn, Configuration $config = null, EventManager
         if (null === $config) {
             $config = new Configuration();
             $config->setProxyDir(__DIR__ . '/../Proxies');
-            $config->setProxyNamespace('Doctrine\Tests\Proxies');
+            $config->setProxyNamespace('DarkWebDesign\DoctrineUnitTesting\Proxies');
             $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
         }
         if (null === $eventManager) {

src/Models/CustomType/CustomIdObjectTypeChild.php

@@ -18,7 +18,7 @@ class CustomIdObjectTypeChild
     public $id;
 
     /**
-     * @ManyToOne(targetEntity="Doctrine\Tests\Models\CustomType\CustomIdObjectTypeParent", inversedBy="children")
+     * @ManyToOne(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\CustomType\CustomIdObjectTypeParent", inversedBy="children")
      */
     public $parent;
 

src/Models/CustomType/CustomIdObjectTypeParent.php

@@ -19,7 +19,7 @@ class CustomIdObjectTypeParent
     public $id;
 
     /**
-     * @OneToMany(targetEntity="Doctrine\Tests\Models\CustomType\CustomIdObjectTypeChild", cascade={"persist", "remove"}, mappedBy="parent")
+     * @OneToMany(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\CustomType\CustomIdObjectTypeChild", cascade={"persist", "remove"}, mappedBy="parent")
      */
     public $children;
 

src/Models/CustomType/CustomTypeParent.php

@@ -20,17 +20,17 @@ class CustomTypeParent
     public $customInteger;
 
     /**
-     * @OneToOne(targetEntity="Doctrine\Tests\Models\CustomType\CustomTypeChild", cascade={"persist", "remove"})
+     * @OneToOne(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\CustomType\CustomTypeChild", cascade={"persist", "remove"})
      */
     public $child;
 
     /**
-     * @ManyToMany(targetEntity="Doctrine\Tests\Models\CustomType\CustomTypeParent", mappedBy="myFriends")
+     * @ManyToMany(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\CustomType\CustomTypeParent", mappedBy="myFriends")
      */
     private $friendsWithMe;
 
     /**
-     * @ManyToMany(targetEntity="Doctrine\Tests\Models\CustomType\CustomTypeParent", inversedBy="friendsWithMe")
+     * @ManyToMany(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\CustomType\CustomTypeParent", inversedBy="friendsWithMe")
      * @JoinTable(
      *     name="customtype_parent_friends",
      *     joinColumns={@JoinColumn(name="customtypeparent_id", referencedColumnName="id")},

src/Models/DDC2372/Traits/DDC2372AddressTrait.php

@@ -5,7 +5,7 @@
 trait DDC2372AddressTrait
 {
     /**
-     * @OneToOne(targetEntity="Doctrine\Tests\Models\DDC2372\DDC2372Address", inversedBy="user")
+     * @OneToOne(targetEntity="DarkWebDesign\DoctrineUnitTesting\Models\DDC2372\DDC2372Address", inversedBy="user")
      * @JoinColumn(name="address_id", referencedColumnName="id")
      */
     private $address;

src/Models/DDC3231/DDC3231User1NoNamespace.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @Entity(repositoryClass="DDC3231User1NoNamespaceRepository")
+ * @Table(name="no_namespace_users")
+ */
+class DDC3231User1NoNamespace
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @Column(type="string", length=255)
+     */
+    protected $name;
+
+}