From cde0f5cfdca91bc738648af1cee7c890eba9e1a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Nov 2019 15:42:08 +0100 Subject: - update to 1.4.0 - raise dependency on PHP 7.2 - raise dependency on doctrine/common 2.11 --- composer.json | 50 ++++++++++++++++++++++++++++-------------- php-doctrine-datafixtures.spec | 29 ++++++++++++++++-------- 2 files changed, 54 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 7c2b629..cebc0a9 100644 --- a/composer.json +++ b/composer.json @@ -2,39 +2,57 @@ "name": "doctrine/data-fixtures", "type": "library", "description": "Data Fixtures for all Doctrine Object Managers", - "keywords": ["database"], + "keywords": [ + "database" + ], "homepage": "http://www.doctrine-project.org", "license": "MIT", "authors": [ - {"name": "Jonathan Wage", "email": "jonwage@gmail.com"} + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } ], "require": { - "php": "^7.1", - "doctrine/common": "~2.2" + "php": "^7.2", + "doctrine/common": "^2.11" + }, + "conflict": { + "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { - "doctrine/orm": "^2.5.4", + "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^6.0", "doctrine/dbal": "^2.5.4", + "doctrine/mongodb-odm": "^1.3.0", + "doctrine/orm": "^2.5.4", "phpunit/phpunit": "^7.0" }, "suggest": { - "doctrine/orm": "For loading ORM fixtures", + "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures", - "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7" - }, - "autoload": { - "psr-4": { "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" } + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" }, - "autoload-dev": { - "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" } + "config": { + "platform": { + "ext-mongo": "1.6.16" + }, + "sort-packages": true }, "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, - "conflict": { - "doctrine/phpcr-odm": "<1.3.0" + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" + } + }, + "autoload-dev": { + "psr-4": { + "Doctrine\\Tests\\": "tests/Doctrine/Tests" + } } } diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec index 43cc806..6657959 100644 --- a/php-doctrine-datafixtures.spec +++ b/php-doctrine-datafixtures.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-datafixtures # -# Copyright (c) 2013-2017 Shawn Iwinski +# Copyright (c) 2013-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,18 +12,17 @@ %global github_owner doctrine %global github_name data-fixtures -%global github_version 1.3.2 -%global github_commit 09b16943b27f3d80d63988d100ff256148c2f78b +%global github_version 1.4.0 +%global github_commit 608a35a3b5bcc4214d116603095f8b0c51091592 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor doctrine %global composer_project data-fixtures -# "php": "^7.1" -%global php_min_ver 7.1 -# "doctrine/common": "~2.2" -# NOTE: Min version not 2.2 because autoloader required -%global doctrine_common_min_ver 2.5 +# "php": "^7.2" +%global php_min_ver 7.2 +# "doctrine/common": "~2.11" +%global doctrine_common_min_ver 2.11 %global doctrine_common_max_ver 3.0 # "doctrine/orm": "^2.5.4" %global doctrine_orm_min_ver 2.5.4 @@ -31,6 +30,9 @@ # "doctrine/dbal": "^2.5.4" %global doctrine_dbal_min_ver 2.5.4 %global doctrine_dbal_max_ver 3.0 +# "alcaeus/mongo-php-adapter": "^1.1" +%global alcaeus_mongo_min_ver 1.1 +%global alcaeus_mongo_max_ver 2 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -57,6 +59,8 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires:(php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver}) BuildRequires:(php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver}) BuildRequires:(php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} with php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver}) +BuildRequires:(php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver} with php-composer(alcaeus/mongo-php-adapter) < %{alcaeus_mongo_max_ver}) +# missing doctrine/mongodb-odm %else BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} @@ -64,6 +68,8 @@ BuildRequires: php-composer(doctrine/orm) < %{doctrine_orm_max_ver} BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} +BuildRequires: php-composer(alcaeus/mongo-php-adapter) < %{alcaeus_mongo_max_ver} +BuildRequires: php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver} %endif BuildRequires: phpunit7 ## phpcompatinfo (computed from version 1.0.2) @@ -79,8 +85,8 @@ Requires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver}) # composer.json: optional -Suggests: php-composer(doctrine/orm) Suggests: php-composer(alcaeus/mongo-php-adapter) +# missing option doctrine/mongodb-odm %else Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver} Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} @@ -172,6 +178,11 @@ exit $RETURN_CODE %changelog +* Wed Nov 13 2019 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- raise dependency on PHP 7.2 +- raise dependency on doctrine/common 2.11 + * Thu Jul 11 2019 Remi Collet - 1.3.2-1 - update to 1.3.2 - sources from git snapshot because of .gitattributes -- cgit