From 1d11be2db597a8df09c12ff8e65393d3180b972e Mon Sep 17 00:00:00 2001 From: Andrey Oprokidnev Date: Wed, 7 Sep 2016 23:09:25 +0500 Subject: [PATCH 1/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b637d03..85fa891 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=5.3.3", "zf-commons/zfc-user": "*", - "doctrine/doctrine-orm-module": "~1.0" + "doctrine/doctrine-orm-module": "~1.0 || dev-master" }, "autoload": { "psr-0": { From 7e5015aa5d86301708c4a62fff8fc12771722ccb Mon Sep 17 00:00:00 2001 From: Andrey Oprokidnev Date: Fri, 30 Sep 2016 14:22:54 +0500 Subject: [PATCH 2/6] composer.json for fork usage --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 85fa891..305fc2b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "zf-commons/zfc-user-doctrine-orm", + "name": "oprokidnev/zfc-user-doctrine-orm", "description": "Doctrine2 ORM storage adapter for ZfcUser.", "type": "library", "license": "BSD-3-Clause", From f580835dec730c566da6e6011e9cc42e610e0fc3 Mon Sep 17 00:00:00 2001 From: Andrey Oprokidnev Date: Tue, 6 Feb 2018 19:55:18 +0500 Subject: [PATCH 3/6] PHP 7.1 version release --- composer.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 305fc2b..78928d4 100644 --- a/composer.json +++ b/composer.json @@ -11,18 +11,13 @@ "homepage": "https://github.com/ZF-Commons/ZfcUserDoctrineORM", "authors": [ { - "name": "Evan Coury", - "email": "me@evancoury.com", - "homepage": "http://blog.evan.pro/" - }, - { - "name": "Kyle Spraggs", - "email": "theman@spiffyjr.me", - "homepage": "http://www.spiffyjr.me/" + "name": "Andrey Oprokidnev", + "email": "oprokidnev@gmail.com", + "homepage": "http://oprokidnev.ru/" } ], "require": { - "php": ">=5.3.3", + "php": ">=7.0 <7.2", "zf-commons/zfc-user": "*", "doctrine/doctrine-orm-module": "~1.0 || dev-master" }, From 1a7ec484e9047387b46f1f85c19349ba1ea3ca97 Mon Sep 17 00:00:00 2001 From: Andrey Oprokidnev Date: Tue, 6 Feb 2018 19:59:17 +0500 Subject: [PATCH 4/6] PHP7.2 error fixes --- composer.json | 7 ++++++- src/ZfcUserDoctrineORM/Mapper/User.php | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 78928d4..b0fbb95 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": ">=7.0 <7.2", + "php": "^7.1", "zf-commons/zfc-user": "*", "doctrine/doctrine-orm-module": "~1.0 || dev-master" }, @@ -28,5 +28,10 @@ "classmap": [ "./" ] + }, + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } } } diff --git a/src/ZfcUserDoctrineORM/Mapper/User.php b/src/ZfcUserDoctrineORM/Mapper/User.php index 5def5f3..f1c4c11 100644 --- a/src/ZfcUserDoctrineORM/Mapper/User.php +++ b/src/ZfcUserDoctrineORM/Mapper/User.php @@ -5,7 +5,7 @@ use Doctrine\ORM\EntityManagerInterface; use ZfcUser\Mapper\User as ZfcUserMapper; use ZfcUserDoctrineORM\Options\ModuleOptions; -use Zend\Stdlib\Hydrator\HydratorInterface; +use Zend\Hydrator\HydratorInterface; class User extends ZfcUserMapper { @@ -46,12 +46,12 @@ public function findById($id) return $er->find($id); } - public function insert($entity, $tableName = null, HydratorInterface $hydrator = null) + public function insert($entity, $tableName = null, ?HydratorInterface $hydrator = null) { return $this->persist($entity); } - public function update($entity, $where = null, $tableName = null, HydratorInterface $hydrator = null) + public function update($entity, $where = null, $tableName = null, ?HydratorInterface $hydrator = null) { return $this->persist($entity); } From 090dd8fd2bb8c3a65aba001bb07a1840b733ceaf Mon Sep 17 00:00:00 2001 From: lexxur Date: Mon, 14 Oct 2019 14:33:45 +0500 Subject: [PATCH 5/6] name update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b0fbb95..b58bd0f 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "oprokidnev/zfc-user-doctrine-orm", + "name": "lexxur/zfc-user-doctrine-orm", "description": "Doctrine2 ORM storage adapter for ZfcUser.", "type": "library", "license": "BSD-3-Clause", From 1cbe92a0406d96a2995c9329fc61924df33723ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=80=D0=B8=D0=BD=20=D0=90=D0=BB=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D0=B5=D0=B9?= Date: Mon, 14 Oct 2019 14:52:45 +0500 Subject: [PATCH 6/6] Mapper/User: some declarations update --- src/ZfcUserDoctrineORM/Mapper/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ZfcUserDoctrineORM/Mapper/User.php b/src/ZfcUserDoctrineORM/Mapper/User.php index f1c4c11..04ae46e 100644 --- a/src/ZfcUserDoctrineORM/Mapper/User.php +++ b/src/ZfcUserDoctrineORM/Mapper/User.php @@ -46,12 +46,12 @@ public function findById($id) return $er->find($id); } - public function insert($entity, $tableName = null, ?HydratorInterface $hydrator = null) + public function insert(\ZfcUser\Entity\UserInterface $entity, $tableName = null, HydratorInterface $hydrator = null) { return $this->persist($entity); } - public function update($entity, $where = null, $tableName = null, ?HydratorInterface $hydrator = null) + public function update(\ZfcUser\Entity\UserInterface $entity, $where = null, $tableName = null, HydratorInterface $hydrator = null) { return $this->persist($entity); }