Merge pull request #608 from doctrine/develop

Develop

Author: TomHAnderson

.gitignore

@@ -3,4 +3,6 @@ vendor/
 phpunit.xml
 .project/
 nbproject/
-composer.phar
+composer.phar
+.phpcs-cache
+.phpunit.result.cache

.travis.yml

@@ -15,32 +15,17 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env:
-        - DEPS=lowest
-    - php: 7.1
-      env:
-        - DEPS=locked
-        - TEST_COVERAGE=true
-    - php: 7.1
-      env:
-        - DEPS=latest
-    - php: 7.1
-      env:
-        - DEPS=dev
     - php: 7.2
       env:
         - DEPS=lowest
     - php: 7.2
       env:
         - DEPS=locked
         - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.2
       env:
         - DEPS=latest
-    - php: 7.2
-      env:
-        - DEPS=dev
     - php: 7.3
       env:
         - DEPS=lowest
@@ -50,26 +35,20 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
-    - php: 7.3
-      env:
-        - DEPS=dev
-    - php: 7.4snapshot
+    - php: 7.4
       env:
         - DEPS=lowest
-    - php: 7.4snapshot
+    - php: 7.4
       env:
         - DEPS=locked
-    - php: 7.4snapshot
+    - php: 7.4
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.4snapshot
 
 before_install:
   - mysql -e 'CREATE DATABASE `database`;'
 
 install:
-  - if [[ $DEPS == 'dev' ]]; then travis_retry composer config minimum-stability dev ; fi
   - travis_retry composer install $COMPOSER_ARGS
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
@@ -89,3 +68,4 @@ after_script:
   - rm -Rf config/application.config.php
   - if [[ $TEST_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi
+

.travis/config/application.config.php

@@ -2,13 +2,13 @@
 
 return [
     'modules' => [
-        'Zend\Cache',
-        'Zend\Form',
-        'Zend\Hydrator',
-        'Zend\Mvc\Console',
-        'Zend\Paginator',
-        'Zend\Router',
-        'Zend\Validator',
+        'Laminas\Cache',
+        'Laminas\Form',
+        'Laminas\Hydrator',
+        'Laminas\Mvc\Console',
+        'Laminas\Paginator',
+        'Laminas\Router',
+        'Laminas\Validator',
         'DoctrineModule',
         'DoctrineORMModule',
     ],

README.md

@@ -1,8 +1,8 @@
-# Doctrine 2 ORM Module for Zend Framework
+# Doctrine 2 ORM Module for Laminas
 
 [![Master branch build status](https://secure.travis-ci.org/doctrine/DoctrineORMModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineORMModule) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/badges/quality-score.png?s=1e2a047fb1bb0f66937bcbc3a61f960c8089c835)](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/) [![Code Coverage](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/badges/coverage.png?s=377656ded5ffaaf4635acfb26729caa212fb5d76)](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/) [![Latest Stable Version](https://poser.pugx.org/doctrine/doctrine-orm-module/v/stable.png)](https://packagist.org/packages/doctrine/doctrine-orm-module) [![Total Downloads](https://poser.pugx.org/doctrine/doctrine-orm-module/downloads.png)](https://packagist.org/packages/doctrine/doctrine-orm-module)
 
-DoctrineORMModule integrates Doctrine 2 ORM with Zend Framework quickly and easily.
+DoctrineORMModule integrates Doctrine 2 ORM with Laminas quickly and easily.
 
   - Doctrine 2 ORM support
   - Multiple ORM entity managers

composer.json

@@ -1,13 +1,13 @@
 {
     "name":              "doctrine/doctrine-orm-module",
-    "description":       "Zend Framework Module that provides Doctrine ORM functionality",
+    "description":       "Laminas Module that provides Doctrine ORM functionality",
     "type":              "library",
     "license":           "MIT",
     "keywords":          [
         "doctrine",
         "orm",
         "module",
-        "zf"
+        "laminas"
     ],
     "homepage":          "http://www.doctrine-project.org/",
     "authors":           [
@@ -29,41 +29,45 @@
         {
             "name":  "Guilherme Blanco",
             "email": "guilhermeblanco@hotmail.com"
+        },
+        {
+            "name": "Tom H Anderson",
+            "email": "tom.h.anderson@gmail.com"
         }
     ],
     "extra": {
-        "zf": {
+        "laminas": {
             "config-provider": "DoctrineORMModule\\ConfigProvider",
             "module": "DoctrineORMModule"
         }
     },
     "require":           {
-        "php":                               "^7.1",
-        "doctrine/doctrine-module":          "^2.1.3",
-        "doctrine/orm":                      "^2.6.3",
-        "doctrine/dbal":                     "^2.6.0",
-        "symfony/console":                   "^3.3 || ^4.0 || ^5.0",
-        "zendframework/zend-stdlib":         "^3.2.1",
-        "zendframework/zend-hydrator":       "^2.3",
-        "zendframework/zend-mvc":            "^3.1",
-        "zendframework/zend-servicemanager": "^3.3"
+        "php":                               "^7.2",
+        "doctrine/dbal":                     "^2.10",
+        "doctrine/doctrine-module":          "^4.0",
+        "doctrine/orm":                      "^2.6.4",
+        "symfony/console":                   "^5.0"
     },
     "require-dev":       {
-        "phpunit/phpunit":                    "^7.0.3",
-        "squizlabs/php_codesniffer":          "^2.7",
-        "doctrine/data-fixtures":             "^1.2.1",
-        "doctrine/migrations":                "^1.5 || ^2.0",
-        "zendframework/zend-console":         "^2.6",
-        "zendframework/zend-developer-tools": "^1.1",
-        "zendframework/zend-i18n":            "^2.7.3",
-        "zendframework/zend-log":             "^2.9",
-        "zendframework/zend-modulemanager":   "^2.7.2",
-        "zendframework/zend-mvc-console":     "^1.2",
-        "zendframework/zend-serializer":      "^2.8"
+        "doctrine/annotations":            "^1.8",
+        "doctrine/coding-standard":        "^7.0.2",
+        "doctrine/data-fixtures":          "^1.2.1",
+        "doctrine/migrations":             "^1.5 || ^2.0",
+        "laminas/laminas-code":            "^3.3.2",
+        "laminas/laminas-console":         "^2.6",
+        "laminas/laminas-developer-tools": "^1.1",
+        "laminas/laminas-i18n":            "^2.7.3",
+        "laminas/laminas-log":             "^2.9",
+        "laminas/laminas-modulemanager":   "^2.7.2",
+        "laminas/laminas-mvc-console":     "^1.2",
+        "laminas/laminas-serializer":      "^2.8",
+        "ocramius/proxy-manager":          "^2.2",
+        "phpunit/phpunit":                 "^8.5",
+        "squizlabs/php_codesniffer":       "^3.5"
     },
     "suggest":           {
-        "zendframework/zend-form":            "if you want to use form elements backed by Doctrine",
-        "zendframework/zend-developer-tools": "zend-developer-tools if you want to profile operations executed by the ORM during development",
+        "laminas/laminas-form":            "if you want to use form elements backed by Doctrine",
+        "laminas/laminas-developer-tools": "laminas-developer-tools if you want to profile operations executed by the ORM during development",
         "doctrine/migrations":                "doctrine migrations if you want to keep your schema definitions versioned"
     },
     "autoload":          {
@@ -76,15 +80,15 @@
     },
     "autoload-dev":      {
         "psr-0": {
-            "DoctrineORMModuleTest\\": "tests/"
+            "DoctrineORMModuleTest\\": "test/"
         }
     },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "cs-check": "phpcs",
+        "cs-check": "phpcs --standard=Doctrine src",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --coverage-clover build/clover.xml"