duplicate ZF

6 files changed, 368 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/32.patch b/32.patch
new file mode 100644
index 0000000..bf30fb4
--- /dev/null
+++ b/32.patch
@@ -0,0 +1,22 @@
+From 63daebd552279c00a636a531389f9852f0df50c7 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 2 Jan 2020 15:06:00 +0100
+Subject: [PATCH] Fix Trying to access array offset on value of type null
+
+---
+ src/TableGateway/Feature/SequenceFeature.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/TableGateway/Feature/SequenceFeature.php b/src/TableGateway/Feature/SequenceFeature.php
+index ca31bb7f..75bcf9d5 100644
+--- a/src/TableGateway/Feature/SequenceFeature.php
++++ b/src/TableGateway/Feature/SequenceFeature.php
+@@ -52,7 +52,7 @@ public function preInsert(Insert $insert)
+         $values = $insert->getRawState('values');
+         $key = array_search($this->primaryKeyField, $columns);
+         if ($key !== false) {
+-            $this->sequenceValue = $values[$key];
++            $this->sequenceValue = ($values ? $values[$key] : NULL);
+             return $insert;
+         }
+ 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a2cd659
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..2a35647
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,73 @@
+{
+    "name": "zendframework/zend-db",
+    "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "zf",
+        "zendframework",
+        "db"
+    ],
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-db/",
+        "issues": "https://github.com/zendframework/zend-db/issues",
+        "source": "https://github.com/zendframework/zend-db",
+        "rss": "https://github.com/zendframework/zend-db/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
+    "require": {
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+    },
+    "suggest": {
+        "zendframework/zend-eventmanager": "Zend\\EventManager component",
+        "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+    },
+    "autoload": {
+        "psr-4": {
+            "Zend\\Db\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "files": [
+            "test/autoload.php"
+        ],
+        "psr-4": {
+            "ZendTest\\Db\\": "test/unit",
+            "ZendIntegrationTest\\Db\\": "test/integration"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.11.x-dev",
+            "dev-develop": "2.12.x-dev"
+        },
+        "zf": {
+            "component": "Zend\\Db",
+            "config-provider": "Zend\\Db\\ConfigProvider"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always --testsuite \"unit test\"",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
+        "upload-coverage": "coveralls -v"
+    }
+}
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..87d223d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-laminas-db.spec b/php-laminas-db.spec
new file mode 100644
index 0000000..e73b54e
--- /dev/null
+++ b/php-laminas-db.spec
@@ -0,0 +1,234 @@
+# remirepo/Fedora spec file for php-zendframework-zend-db
+#
+# Copyright (c) 2015-2020 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%global bootstrap    0
+%global gh_commit    71626f95f6f9ee326e4be3c34228c1c466300a2c
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     zendframework
+%global gh_project   zend-db
+%global php_home     %{_datadir}/php
+%global library      Db
+%if %{bootstrap}
+%global with_tests   0%{?_with_tests:1}
+%else
+%global with_tests   0%{!?_without_tests:1}
+%endif
+
+Name:           php-%{gh_owner}-%{gh_project}
+Version:        2.11.0
+Release:        2%{?dist}
+Summary:        Zend Framework %{library} component
+
+License:        BSD
+URL:            https://zendframework.github.io/%{gh_project}/
+Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
+
+Patch0:         https://patch-diff.githubusercontent.com/raw/laminas/laminas-db/pull/32.patch
+
+BuildArch:      noarch
+# Tests
+%if %{with_tests}
+BuildRequires:  php(language) >= 5.6
+BuildRequires:  php-date
+BuildRequires:  php-pcre
+BuildRequires:  php-pdo
+BuildRequires:  php-spl
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# From composer, "require-dev": {
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.14",
+#        "zendframework/zend-coding-standard": "~1.0.0",
+#        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+#        "zendframework/zend-hydrator": ""^1.1 || ^2.1 || ^3.0",
+#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager)   < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-hydrator)       >= 1.1   with php-autoloader(%{gh_owner}/zend-hydrator)       < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+# remirepo:6
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-hydrator)       >= 1.1
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
+%endif
+%global phpunit %{_bindir}/phpunit6
+BuildRequires:  phpunit6 >= 6.5.14
+%endif
+# Autoloader
+BuildRequires:  php-fedora-autoloader-devel
+
+# From composer, "require": {
+#        "php": "^5.6 || ^7.0",
+#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+Requires:       php(language) >= 5.6
+%if ! %{bootstrap}
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# remirepo:4
+%else
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+%endif
+# From composer, "suggest": {
+#        "zendframework/zend-eventmanager": "Zend\\EventManager component",
+#        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+Suggests:       php-autoloader(%{gh_owner}/zend-eventmanager)
+Suggests:       php-autoloader(%{gh_owner}/zend-hydrator)
+Suggests:       php-autoloader(%{gh_owner}/zend-servicemanager)
+%endif
+# Autoloader
+Requires:       php-composer(fedora/autoloader)
+# From phpcompatinfo report for version 2.6.2
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-pdo
+Requires:       php-spl
+
+Obsoletes:      php-ZendFramework2-%{library} < 2.5
+Provides:       php-ZendFramework2-%{library} = %{version}
+Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
+Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
+
+
+%description
+Zend\Db is a component that abstract the access to a Database using an object
+oriented API to build the queries. Zend\Db consumes different storage adapters
+to access different database vendors such as MySQL, PostgreSQL, Oracle,
+IBM DB2, Microsoft Sql Server, PDO, etc.
+
+Documentation: https://zendframework.github.io/%{gh_project}/
+
+
+%prep
+%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1 -b .pr32
+
+mv LICENSE.md LICENSE
+
+
+%build
+: Generate autoloader
+phpab --template fedora --output src/autoload.php src
+cat << 'EOF' | tee -a src/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/Zend/Stdlib/autoload.php',
+]);
+\Fedora\Autoloader\Dependencies::optional([
+    '%{php_home}/Zend/EventManager/autoload.php',
+    '%{php_home}/Zend/Hydrator/autoload.php',
+    '%{php_home}/Zend/ServiceManager/autoload.php',
+]);
+EOF
+
+
+%install
+mkdir -p   %{buildroot}%{php_home}/Zend/
+cp -pr src %{buildroot}%{php_home}/Zend/%{library}
+
+
+%check
+%if %{with_tests}
+mkdir vendor
+cat << 'EOF' | tee vendor/autoload.php
+<?php
+# comptibility layer before PSR-0 autoloader
+require_once dirname(__DIR__) . '/test/autoload.php';
+require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test/unit');
+\Fedora\Autoloader\Autoload::addPsr4('ZendIntegrationTest\\%{library}\\', dirname(__DIR__) . '/test/integration');
+EOF
+
+ret=0
+for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+  if which $cmdarg; then
+    set $cmdarg
+    $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+  fi
+done
+exit $ret
+%else
+: Test suite disabled
+%endif
+
+
+%files
+# remirepo:1
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc *.md
+%doc composer.json
+%{php_home}/Zend/%{library}
+
+
+%changelog
+* Thu Jan  2 2020 Remi Collet <remi@remirepo.net> - 2.11.0-2
+- update to 2.11.0
+- drop patch merged upstream
+- add patch for PHP 7.4 from
+  https://github.com/laminas/laminas-db/pull/32
+
+* Wed Oct  9 2019 Remi Collet <remi@remirepo.net> - 2.10.0-4
+- add patch for PHP 7.4 from
+  https://github.com/zendframework/zend-db/pull/395
+
+* Mon Feb 25 2019 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- update to 2.10.0
+- use range dependencies
+
+* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 2.9.3-2
+- update to 2.9.3
+- only use phpunit6
+
+* Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.9.2-1
+- Update to 2.9.2
+
+* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.9.1-2
+- switch from zend-loader to fedora/autoloader
+
+* Fri Dec  8 2017 Remi Collet <remi@remirepo.net> - 2.9.1-1
+- Update to 2.9.1
+
+* Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 2.9.0-2
+- use phpunit6 on F26+
+
+* Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- Update to 2.9.0
+- raise dependency on PHP 5.6
+
+* Tue Oct 31 2017 Remi Collet <remi@fedoraproject.org> - 2.8.2-4
+- fix FTBFS from Koschei, add patch for PHP 7.2
+  from https://github.com/zendframework/zend-db/pull/276
+
+* Wed Aug 10 2016 Remi Collet <remi@fedoraproject.org> - 2.8.2-1
+- update to 2.8.2
+
+* Thu Apr 14 2016 Remi Collet <remi@fedoraproject.org> - 2.8.1-1
+- update to 2.8.1
+
+* Wed Apr 13 2016 Remi Collet <remi@fedoraproject.org> - 2.8.0-1
+- update to 2.8.0
+- ignore failed tests when no sql server configured
+  open https://github.com/zendframework/zend-db/issues/97
+
+* Tue Feb 23 2016 Remi Collet <remi@fedoraproject.org> - 2.7.0-1
+- update to 2.7.0
+
+* Thu Jan 28 2016 Remi Collet <remi@fedoraproject.org> - 2.6.2-1
+- update to 2.6.2
+- rasie dependency on zend-stdlib ~2.7
+- add optional dependency on zend-hydrator
+
+* Wed Sep 23 2015 Remi Collet <remi@fedoraproject.org> - 2.5.2-1
+- update to 2.5.2
+- raise dependency on php 5.5
+
+* Tue Aug  4 2015 Remi Collet <remi@fedoraproject.org> - 2.5.1-1
+- initial package