diff options
author | Remi Collet <remi@remirepo.net> | 2020-11-09 14:09:01 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2020-11-09 14:09:01 +0100 |
commit | 3a9312ebdc86d05079ea325ffeeb1b1e0f3dcaee (patch) | |
tree | ecf090072ccb61fe736555f8ada0b17e46510a9c | |
parent | 5b8131d962a59912b45b6d4ae1931c48d3de8391 (diff) |
update to 2.10.0
bundle all cache storage adapters
-rw-r--r-- | composer-apc.json | 55 | ||||
-rw-r--r-- | composer-apcu.json | 55 | ||||
-rw-r--r-- | composer-blackhole.json | 51 | ||||
-rw-r--r-- | composer-dba.json | 55 | ||||
-rw-r--r-- | composer-ext-mongodb.json | 55 | ||||
-rw-r--r-- | composer-filesystem.json | 52 | ||||
-rw-r--r-- | composer-memcache.json | 55 | ||||
-rw-r--r-- | composer-memcached.json | 52 | ||||
-rw-r--r-- | composer-memory.json | 52 | ||||
-rw-r--r-- | composer-mongodb.json | 52 | ||||
-rw-r--r-- | composer-redis.json | 52 | ||||
-rw-r--r-- | composer-session.json | 56 | ||||
-rw-r--r-- | composer-test.json | 49 | ||||
-rw-r--r-- | composer-wincache.json | 55 | ||||
-rw-r--r-- | composer-xcache.json | 56 | ||||
-rw-r--r-- | composer-zend-server.json | 52 | ||||
-rw-r--r-- | composer.json | 37 | ||||
-rwxr-xr-x | makesrc.sh | 60 | ||||
-rw-r--r-- | php-laminas-cache.spec | 200 |
19 files changed, 1070 insertions, 81 deletions
diff --git a/composer-apc.json b/composer-apc.json new file mode 100644 index 0000000..62a1b7e --- /dev/null +++ b/composer-apc.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-apc", + "description": "Laminas cache adapter", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + }, + "suggest": { + "ext-apc": "APC or compatible extension, to use the APC storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-apc/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-apc", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-apc/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-apc/releases.atom" + } +} diff --git a/composer-apcu.json b/composer-apcu.json new file mode 100644 index 0000000..c2565b4 --- /dev/null +++ b/composer-apcu.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-apcu", + "description": "Laminas cache adapter for apcu", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-apcu", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-apcu/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/releases.atom" + } +} diff --git a/composer-blackhole.json b/composer-blackhole.json new file mode 100644 index 0000000..601226e --- /dev/null +++ b/composer-blackhole.json @@ -0,0 +1,51 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-blackhole", + "description": "Laminas cache adapter for blackhole", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-blackhole/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-blackhole", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-blackhole/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-blackhole/releases.atom" + } +} diff --git a/composer-dba.json b/composer-dba.json new file mode 100644 index 0000000..9626ad0 --- /dev/null +++ b/composer-dba.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-dba", + "description": "Laminas cache adapter for dba", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-dba": "DBA, to use the DBA storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-dba/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-dba", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-dba/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-dba/releases.atom" + } +} diff --git a/composer-ext-mongodb.json b/composer-ext-mongodb.json new file mode 100644 index 0000000..eb1e978 --- /dev/null +++ b/composer-ext-mongodb.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-ext-mongodb", + "description": "Laminas cache adapter for ext-mongodb", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-ext-mongodb/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-ext-mongodb", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-ext-mongodb/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-ext-mongodb/releases.atom" + } +} diff --git a/composer-filesystem.json b/composer-filesystem.json new file mode 100644 index 0000000..3c74fa3 --- /dev/null +++ b/composer-filesystem.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-filesystem", + "description": "Laminas cache adapter for filesystem", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-filesystem/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-filesystem", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-filesystem/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-filesystem/releases.atom" + } +} diff --git a/composer-memcache.json b/composer-memcache.json new file mode 100644 index 0000000..4b09899 --- /dev/null +++ b/composer-memcache.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-memcache", + "description": "Laminas cache adapter for memcache", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-memcache/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-memcache", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-memcache/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-memcache/releases.atom" + } +} diff --git a/composer-memcached.json b/composer-memcached.json new file mode 100644 index 0000000..57ae91d --- /dev/null +++ b/composer-memcached.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-memcached", + "description": "Laminas cache adapter for memcached", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-memcached/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-memcached", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-memcached/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-memcached/releases.atom" + } +} diff --git a/composer-memory.json b/composer-memory.json new file mode 100644 index 0000000..75964a9 --- /dev/null +++ b/composer-memory.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-memory", + "description": "Laminas cache adapter for memory", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-memory/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-memory", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-memory/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-memory/releases.atom" + } +} diff --git a/composer-mongodb.json b/composer-mongodb.json new file mode 100644 index 0000000..0950663 --- /dev/null +++ b/composer-mongodb.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-mongodb", + "description": "Laminas cache adapter for mongodb", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-mongodb/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-mongodb", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-mongodb/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-mongodb/releases.atom" + } +} diff --git a/composer-redis.json b/composer-redis.json new file mode 100644 index 0000000..9b3849e --- /dev/null +++ b/composer-redis.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-redis", + "description": "Laminas cache adapter for redis", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-redis/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-redis", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-redis/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-redis/releases.atom" + } +} diff --git a/composer-session.json b/composer-session.json new file mode 100644 index 0000000..d8f80b3 --- /dev/null +++ b/composer-session.json @@ -0,0 +1,56 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-session", + "description": "Laminas cache adapter for session", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-session": "^2.7.4", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "laminas/laminas-session": "Laminas\\Session component" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-session/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-session", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-session/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-session/releases.atom" + } +} diff --git a/composer-test.json b/composer-test.json new file mode 100644 index 0000000..5a59901 --- /dev/null +++ b/composer-test.json @@ -0,0 +1,49 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-test", + "description": "Laminas cache storage adapter shared test dependency", + "keywords": [ + "laminas", + "cache", + "test" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0", + "cache/integration-tests": "^0.16", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "squizlabs/php_codesniffer": "^3.5" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "src/" + }, + "files": [ + "test/autoload.php" + ] + }, + "minimum-stability": "dev", + "prefer-stable": true, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-test/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-test", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-test/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-test/releases.atom" + } +} diff --git a/composer-wincache.json b/composer-wincache.json new file mode 100644 index 0000000..6dbdfc9 --- /dev/null +++ b/composer-wincache.json @@ -0,0 +1,55 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-wincache", + "description": "Laminas cache adapter for wincache", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-wincache": "WinCache, to use the WinCache storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-wincache/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-wincache", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-wincache/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-wincache/releases.atom" + } +} diff --git a/composer-xcache.json b/composer-xcache.json new file mode 100644 index 0000000..dbc383d --- /dev/null +++ b/composer-xcache.json @@ -0,0 +1,56 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-xcache", + "description": "Laminas cache adapter for xcache", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-serializer": "^2.9", + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-xcache": "XCache, to use the XCache storage adapter" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-xcache/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-xcache", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-xcache/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-xcache/releases.atom" + } +} diff --git a/composer-zend-server.json b/composer-zend-server.json new file mode 100644 index 0000000..998fa93 --- /dev/null +++ b/composer-zend-server.json @@ -0,0 +1,52 @@ +{ + "name": "laminas/laminas-cache-storage-adapter-zend-server", + "description": "Laminas cache adapter for zend-server", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.10", + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-zend-server/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-zend-server", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-zend-server/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-zend-server/releases.atom" + } +} diff --git a/composer.json b/composer.json index ca36824..efd87f3 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,6 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "2.9.x-dev", - "dev-develop": "2.10.x-dev" - }, "laminas": { "component": "Laminas\\Cache", "config-provider": "Laminas\\Cache\\ConfigProvider" @@ -33,6 +29,21 @@ }, "require": { "php": "^5.6 || ^7.0", + "laminas/laminas-cache-storage-adapter-apc": "^1.0", + "laminas/laminas-cache-storage-adapter-apcu": "^1.0", + "laminas/laminas-cache-storage-adapter-blackhole": "^1.0", + "laminas/laminas-cache-storage-adapter-dba": "^1.0", + "laminas/laminas-cache-storage-adapter-ext-mongodb": "^1.0", + "laminas/laminas-cache-storage-adapter-filesystem": "^1.0", + "laminas/laminas-cache-storage-adapter-memcache": "^1.0", + "laminas/laminas-cache-storage-adapter-memcached": "^1.0", + "laminas/laminas-cache-storage-adapter-memory": "^1.0", + "laminas/laminas-cache-storage-adapter-mongodb": "^1.0", + "laminas/laminas-cache-storage-adapter-redis": "^1.0", + "laminas/laminas-cache-storage-adapter-session": "^1.0", + "laminas/laminas-cache-storage-adapter-wincache": "^1.0", + "laminas/laminas-cache-storage-adapter-xcache": "^1.0", + "laminas/laminas-cache-storage-adapter-zend-server": "^1.0", "laminas/laminas-eventmanager": "^2.6.3 || ^3.2", "laminas/laminas-servicemanager": "^2.7.8 || ^3.3", "laminas/laminas-stdlib": "^3.2.1", @@ -44,7 +55,6 @@ "cache/integration-tests": "^0.16", "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-serializer": "^2.6", - "laminas/laminas-session": "^2.7.4", "phpbench/phpbench": "^0.13", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" }, @@ -53,20 +63,7 @@ "psr/simple-cache-implementation": "1.0" }, "suggest": { - "ext-apc": "APC or compatible extension, to use the APC storage adapter", - "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter", - "ext-dba": "DBA, to use the DBA storage adapter", - "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter", - "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter", - "ext-mongo": "Mongo, to use MongoDb storage adapter", - "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter", - "ext-redis": "Redis, to use Redis storage adapter", - "ext-wincache": "WinCache, to use the WinCache storage adapter", - "ext-xcache": "XCache, to use the XCache storage adapter", - "laminas/laminas-serializer": "Laminas\\Serializer component", - "laminas/laminas-session": "Laminas\\Session component", - "mongodb/mongodb": "Required for use with the ext-mongodb adapter", - "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement" + "laminas/laminas-serializer": "Laminas\\Serializer component" }, "autoload": { "files": [ @@ -96,6 +93,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-cache": "self.version" + "zendframework/zend-cache": "^2.9.0" } } @@ -1,28 +1,50 @@ #!/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} +function archive() { + SHORT=${COMMIT:0:7} + + if [ -f $NAME-$VERSION-$SHORT.tgz ] + then + echo Skip $NAME + else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION ($COMMIT)\n" + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + echo "Getting commit..." + pushd $PROJECT-$COMMIT + if git checkout $COMMIT; then + cp composer.json ../${1:-composer.json} + else + exit 1 + fi + popd -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + fi +} -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT +NAME=$(basename $PWD) +SPEC=$NAME.spec +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $SPEC) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $SPEC) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $SPEC) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $SPEC) +archive -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT +for i in test apc apcu blackhole dba ext-mongodb filesystem memcache memcached memory mongodb redis session wincache xcache zend-server +do + j=${i/-/_} + NAME=php-laminas-cache-storage-adapter-$i + COMMIT=$(sed -n "/^%global gh_${j}_commit/{s/.* //;p}" $SPEC) + VERSION=$(sed -n "/^%global gh_${j}_version/{s/.* //;p}" $SPEC) + PROJECT=laminas-cache-storage-adapter-$i + archive composer-$i.json +done echo "Done." diff --git a/php-laminas-cache.spec b/php-laminas-cache.spec index e328ba3..6a3f9dc 100644 --- a/php-laminas-cache.spec +++ b/php-laminas-cache.spec @@ -6,9 +6,12 @@ # # Please, preserve the changelog entries # + +%bcond_without tests + # When buid without laminas-session -%global bootstrap 1 -%global gh_commit f4746a868c3e2f2da63c19d23efac12b9d1bb554 +%global bootstrap 0 +%global gh_commit 060b2a71d42b12122a3546594727e7d4b870abd5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-cache @@ -16,24 +19,108 @@ %global php_home %{_datadir}/php %global namespace Laminas %global library Cache -%global with_tests 0%{!?_without_tests:1} + +# Adapter tests +%global gh_test_commit 44bef5944e465ef29ea0a36b910c78f89ff9d4c8 +%global gh_test_version 1.0.1 +%global gh_test_short %(c=%{gh_test_commit}; echo ${c:0:7}) +# APC adapter +%global gh_apc_commit 8b375d994f6e67534f6ae6e995249e706faa30c1 +%global gh_apc_version 1.0.1 +%global gh_apc_short %(c=%{gh_apc_commit}; echo ${c:0:7}) +# APCu adapter +%global gh_apcu_commit 1fdd7585042c1a577f6e630535df1e86e23cf5dc +%global gh_apcu_version 1.0.1 +%global gh_apcu_short %(c=%{gh_apcu_commit}; echo ${c:0:7}) +# Blackhole adapter +%global gh_blackhole_commit 5f2cb437160fbc01d7f216b11e4f1ff4c9b95c49 +%global gh_blackhole_version 1.0.1 +%global gh_blackhole_short %(c=%{gh_blackhole_commit}; echo ${c:0:7}) +# Dba adapter +%global gh_dba_commit ad968d3d8a0350af8e6717be58bb96e5a9e77f3b +%global gh_dba_version 1.0.1 +%global gh_dba_short %(c=%{gh_dba_commit}; echo ${c:0:7}) +# ExtMongodb adapter +%global gh_ext_mongodb_commit 011ec5a8ca721ba012d232b1a01b50a55904b99f +%global gh_ext_mongodb_version 1.0.1 +%global gh_ext_mongodb_short %(c=%{gh_ext_mongodb_commit}; echo ${c:0:7}) +# Filesystem adapter +%global gh_filesystem_commit ae1723bcd84efbdae8f20cbb1bacb9ce9c13dbde +%global gh_filesystem_version 1.0.1 +%global gh_filesystem_short %(c=%{gh_filesystem_commit}; echo ${c:0:7}) +# Memcache adapter +%global gh_memcache_commit 62d0fab1cd261b44a81821e986c0110d7dda896b +%global gh_memcache_version 1.0.1 +%global gh_memcache_short %(c=%{gh_memcache_commit}; echo ${c:0:7}) +# Memcached adapter +%global gh_memcached_commit 29599106bb501eb96207b175c460c95487518db1 +%global gh_memcached_version 1.0.1 +%global gh_memcached_short %(c=%{gh_memcached_commit}; echo ${c:0:7}) +# Memory adapter +%global gh_memory_commit 58f4b45281552bb6673c900fadddad21e0ed05c8 +%global gh_memory_version 1.0.1 +%global gh_memory_short %(c=%{gh_memory_commit}; echo ${c:0:7}) +# Mongodb adapter +%global gh_mongodb_commit ef4aa396b55533b8eb3e1d4126c39a78a22e49a6 +%global gh_mongodb_version 1.0.1 +%global gh_mongodb_short %(c=%{gh_mongodb_commit}; echo ${c:0:7}) +# Redis adapter +%global gh_redis_commit 3fe904953d17728d7fdaa87be603231f23fb0a4d +%global gh_redis_version 1.0.1 +%global gh_redis_short %(c=%{gh_redis_commit}; echo ${c:0:7}) +# Session adapter +%global gh_session_commit 0d2276cd61bd162cd38c53aaa22f18137621dc0c +%global gh_session_version 1.0.1 +%global gh_session_short %(c=%{gh_session_commit}; echo ${c:0:7}) +# wincache adapter - Windows only +%global gh_wincache_commit 0f54599c5d9aff11b01adadd2742097f923170ba +%global gh_wincache_version 1.0.1 +%global gh_wincache_short %(c=%{gh_wincache_commit}; echo ${c:0:7}) +# xcache adapter - PHP 5 only +%global gh_xcache_commit 24049557aa796ec7527bcc8032ed68346232b219 +%global gh_xcache_version 1.0.1 +%global gh_xcache_short %(c=%{gh_xcache_commit}; echo ${c:0:7}) +# zend-server adapter +%global gh_zend_server_commit 8d0b0d219a048a92472d89a5e527990f3ea2decc +%global gh_zend_server_version 1.0.1 +%global gh_zend_server_short %(c=%{gh_zend_server_commit}; echo ${c:0:7}) + Name: php-%{gh_project} -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: %{namespace} Framework %{library} component License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +# Adapter tests +Source100: %{name}-storage-adapter-test-%{gh_test_version}-%{gh_test_short}.tgz +# Adapters +Source101: %{name}-storage-adapter-apc-%{gh_apc_version}-%{gh_apc_short}.tgz +Source102: %{name}-storage-adapter-apcu-%{gh_apcu_version}-%{gh_apcu_short}.tgz +Source103: %{name}-storage-adapter-blackhole-%{gh_blackhole_version}-%{gh_blackhole_short}.tgz +Source104: %{name}-storage-adapter-dba-%{gh_dba_version}-%{gh_dba_short}.tgz +Source105: %{name}-storage-adapter-ext-mongodb-%{gh_ext_mongodb_version}-%{gh_ext_mongodb_short}.tgz +Source106: %{name}-storage-adapter-filesystem-%{gh_filesystem_version}-%{gh_filesystem_short}.tgz +Source107: %{name}-storage-adapter-memcache-%{gh_memcache_version}-%{gh_memcache_short}.tgz +Source108: %{name}-storage-adapter-memcached-%{gh_memcached_version}-%{gh_memcached_short}.tgz +Source109: %{name}-storage-adapter-memory-%{gh_memory_version}-%{gh_memory_short}.tgz +Source110: %{name}-storage-adapter-mongodb-%{gh_mongodb_version}-%{gh_mongodb_short}.tgz +Source111: %{name}-storage-adapter-redis-%{gh_redis_version}-%{gh_redis_short}.tgz +Source112: %{name}-storage-adapter-session-%{gh_session_version}-%{gh_session_short}.tgz +Source113: %{name}-storage-adapter-wincache-%{gh_wincache_version}-%{gh_wincache_short}.tgz +Source114: %{name}-storage-adapter-xcache-%{gh_xcache_version}-%{gh_xcache_short}.tgz +Source115: %{name}-storage-adapter-zend-server-%{gh_zend_server_version}-%{gh_zend_server_short}.tgz BuildArch: noarch # Tests -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-reflection BuildRequires: php-date +BuildRequires: php-dba BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 @@ -56,7 +143,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.6 %if ! %{bootstrap} BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.7.4 with php-autoloader(%{gh_owner}/laminas-session) < 3) %endif -# remirepo:14 +# remirepo:13 %else BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-servicemanager @@ -93,6 +180,17 @@ Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2. Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) Requires: (php-composer(psr/simple-cache) >= 1.0 with php-composer(psr/simple-cache) < 2) +# From composer, "suggest": { +# "laminas/laminas-serializer": "Laminas\\Serializer component" +Recommends: php-composer(%{gh_owner}/laminas-serializer) +# From adapters +Recommends: php-composer(%{gh_owner}/laminas-session) +Suggests: php-apcu +Suggests: php-dba +Suggests: php-memcache +Suggests: php-memcached +Suggests: php-redis +Suggests: php-composer(mongodb/mongodb) # remirepo:8 %else Requires: php-laminas-eventmanager @@ -102,29 +200,6 @@ Requires: php-laminas-zendframework-bridge Requires: php-psr-cache Requires: php-psr-simple-cache %endif -# From composer, "suggest": { -# "ext-apc": "APC or compatible extension, to use the APC storage adapter", -# "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter", -# "ext-dba": "DBA, to use the DBA storage adapter", -# "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter", -# "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter", -# "ext-mongo": "Mongo, to use MongoDb storage adapter", -# "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter", -# "ext-redis": "Redis, to use Redis storage adapter", -# "ext-wincache": "WinCache, to use the WinCache storage adapter", -# "ext-xcache": "XCache, to use the XCache storage adapter", -# "laminas/laminas-serializer": "Laminas\\Serializer component", -# "laminas/laminas-session": "Laminas\\Session component", -# "mongodb/mongodb": "Required for use with the ext-mongodb adapter", -# "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement" -Suggests: php-apcu -Suggests: php-dba -Suggests: php-memcache -Suggests: php-memcached -Suggests: php-redis -Suggests: php-composer(%{gh_owner}/laminas-serializer) -Suggests: php-composer(%{gh_owner}/laminas-session) -Suggests: php-composer(mongodb/mongodb) # From phpcompatinfo report for version 2.9.0 Requires: php-reflection Requires: php-date @@ -141,14 +216,30 @@ Provides: php-ZendFramework2-%{library} = %{version} Provides: php-ZendFramework2-%{library}-apc = %{version} Provides: php-ZendFramework2-%{library}-memcached = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.9.0-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.9.1 +Provides: php-zendframework-%{zf_name} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} Provides: php-autoloader(zendframework/%{zf_name}) = %{version} Provides: php-composer(psr/cache-implementation) = 1.0 Provides: php-composer(psr/simple-cache-implementation) = 1.0 +# Adapters +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-apc) = %{gh_apc_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-apcu) = %{gh_apcu_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-blackhole) = %{gh_apcu_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-dba) = %{gh_dba_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-ext-mongodb) = %{gh_ext_mongodb_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-filesystem) = %{gh_filesystem_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-memcache) = %{gh_memcache_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-memcached) = %{gh_memcached_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-memory) = %{gh_memory_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-mongodb) = %{gh_mongodb_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-redis) = %{gh_redis_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-session) = %{gh_session_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-wincache) = %{gh_wincache_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-xcache) = %{gh_xcache_version} +Provides: php-composer(%{gh_owner}/laminas-cache-storage-adapter-zend-server) = %{gh_zend_server_version} %description @@ -161,11 +252,35 @@ Documentation: https://docs.laminas.dev/%{gh_project}/ %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{gh_commit} -a100 -a101 -a102 -a103 -a104 -a105 -a106 -a107 -a108 -a109 -a110 -a111 -a112 -a113 -a114 -a115 mv LICENSE.md LICENSE mv autoload/*.php src +for i in apc apcu blackhole dba ext-mongodb filesystem memcache memcached memory mongodb redis session wincache xcache zend-server +do + pushd laminas-cache-storage-adapter-$i-* + mv src/* ../src/Storage/Adapter + mv CHANGELOG.md ../CHANGELOG-$i.md + mv LICENSE.md ../LICENSE-$i + mv composer.json ../composer-$i.json + case $i in + ext-mongodb|memcache|memcached|mongodb|redis) + # skip test requiring a running server + ;; +%if %{bootstrap} + session) + ;; +%endif + *) + mv test ../test/Storage/Adapter/$i + ;; + esac + popd +done + +mv laminas-cache-storage-adapter-test-*/src/* test/Storage/Adapter/ + %build : Create autoloader @@ -208,7 +323,7 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php @@ -222,14 +337,11 @@ EOF # Try to slowdown tests with erratic results sed -e '/unlinkDelay/s/5000/50000/' \ -e '/usleep/s/1000/10000/' \ - -i test/Storage/Adapter/FilesystemTest.php - -%if %{bootstrap} -rm test/Storage/Adapter/SessionTest.php -%endif + -i test/Storage/Adapter/filesystem/unit/FilesystemTest.php : upstream test suite ret=0 +# TODO php80 for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg @@ -252,14 +364,18 @@ exit $ret %files # remirepo:1 %{!?_licensedir:%global license %%doc} -%license LICENSE +%license LICENSE* %doc *.md -%doc composer.json +%doc composer*.json %{php_home}/Zend/%{library} %{php_home}/%{namespace}/%{library} %changelog +* Mon Nov 9 2020 Remi Collet <remi@remirepo.net> - 2.10.0-1 +- update to 2.10.0 +- bundle all cache storage adapters + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.9.0-2 - cleanup |