diff --git a/.travis.yml b/.travis.yml index 092fa2a..c50670a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,10 @@ language: php -env: - - ZF_VERSION=^2.4 - - ZF_VERSION=2.4.* - - ZF_VERSION=2.5.* - php: - 5.6 - 7.0 - 7.1 -before_install: - - composer require --update-with-dependencies zendframework/zend-loader:${ZF_VERSION} zendframework/zend-servicemanager:${ZF_VERSION} zendframework/zend-modulemanager:${ZF_VERSION} zendframework/zend-mvc:${ZF_VERSION} zendframework/zend-view:${ZF_VERSION} zendframework/zend-serializer:${ZF_VERSION} zendframework/zend-log:${ZF_VERSION} zendframework/zend-i18n:${ZF_VERSION} zendframework/zend-http:${ZF_VERSION} zendframework/zend-console:${ZF_VERSION} - script: ./build.sh after_success: diff --git a/README.md b/README.md index 46ca935..727a8e7 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,23 @@ -DOMPDFModule +DompdfModule ============ [![Build Status](https://secure.travis-ci.org/raykolbe/DOMPDFModule.png?branch=master)](http://travis-ci.org/raykolbe/DOMPDFModule) [![Code Climate](https://codeclimate.com/github/raykolbe/DOMPDFModule/badges/gpa.svg)](https://codeclimate.com/github/raykolbe/DOMPDFModule) [![Test Coverage](https://codeclimate.com/github/raykolbe/DOMPDFModule/badges/coverage.svg)](https://codeclimate.com/github/raykolbe/DOMPDFModule/coverage) [![Total Downloads](https://poser.pugx.org/dino/dompdf-module/downloads)](https://packagist.org/packages/dino/dompdf-module) [![License](https://poser.pugx.org/dino/dompdf-module/license)](https://packagist.org/packages/dino/dompdf-module) -The DOMPDF module integrates the DOMPDF library with Zend Framework 2 with minimal effort on the consumer's end. +DompdfModule integrates the [Dompdf](https://github.com/dompdf/dompdf) library with Zend Framework. ## Requirements - - [Zend Framework 2](http://www.github.com/zendframework/zf2) + - PHP 5.6+ + - [Zend Framework](https://github.com/zendframework/zendframework) ## Installation -Installation of DOMPDFModule uses PHP Composer. For more information about -PHP Composer, please visit the official [PHP Composer site](http://getcomposer.org/). - -#### Installation steps - - 1. `cd my/project/directory` - 2. create a `composer.json` file with following contents: - - ```json - { - "require": { - "dino/dompdf-module": "dev-master" - } - } - ``` - 3. install PHP Composer via `curl -s http://getcomposer.org/installer | php` (on windows, download - http://getcomposer.org/installer and execute it with PHP) - 4. run `php composer.phar install` - 5. open `my/project/directory/config/application.config.php` and add the following key to your `modules`: - - ```php - 'DOMPDFModule', - ``` +It is recommended that you use [Composer](http://getcomposer.org/) to install this package. + +``` +composer require dino/dompdf-module +``` + #### Configuration options -You can override options via the `dompdf_module` key in your local or global config files. See DOMPDFModule/config/module.config.php for config options. +You can override options via the `dompdf_module` key in your local or global config files. See DompdfModule/config/module.config.php for config options. ## Usage @@ -43,24 +27,22 @@ You can override options via the `dompdf_module` key in your local or global con namespace Application\Controller; use Zend\Mvc\Controller\AbstractActionController; -use DOMPDFModule\View\Model\PdfModel; +use DompdfModule\View\Model\PdfModel; class ReportController extends AbstractActionController { public function monthlyReportPdfAction() { - $pdf = new PdfModel(); - $pdf->setOption('fileName', 'monthly-report'); // "pdf" extension is automatically appended - $pdf->setOption('display', PdfModel::DISPLAY_ATTACHMENT); // Triggers browser to prompt "save as" dialog - $pdf->setOption('paperSize', 'a4'); // Defaults to "8x11" - $pdf->setOption('paperOrientation', 'landscape'); // Defaults to "portrait" - - // To set view variables - $pdf->setVariables(array( - 'message' => 'Hello' - )); - - return $pdf; + return (new PdfModel()) + ->setOptions([ + 'fileName' => 'monthly-report', + 'display' => PdfModel::DISPLAY_ATTACHMENT, + 'paperSize' => 'a4', + 'paperOrientation' => 'landscape' + ]) + ->setVariables([ + 'message' => 'Hello' + ]); } } ``` @@ -91,7 +73,4 @@ By default, builds executed using Docker are done so using the [latest stable ve ``` docker build --build-arg PHP_VERSION=5.6 --tag dino/dompdf-module-php56 . docker run -v composer-cache:/var/lib/composer -v ${PWD}:/opt/app dino/dompdf-module-php56 -``` - -## To-do - - Add command line support. +``` \ No newline at end of file diff --git a/build.sh b/build.sh index 33eb407..0a7dd28 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,6 @@ composer --prefer-dist install php -l ${PROJECT_ROOT}/src php -l ${PROJECT_ROOT}/config php -l ${PROJECT_ROOT}/tests -php -l ${PROJECT_ROOT}/Module.php # ------------------------------------------------------------------ # Test diff --git a/composer.json b/composer.json index b124712..76a227e 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "dino/dompdf-module", "type": "library", - "description": "A Zend Framework 2 module for incorporating DOMPDF support.", + "description": "A Zend Framework 2 module for incorporating Dompdf support.", "keywords": ["pdf","dompdf", "zf2"], "homepage": "http://raymondkolbe.com", "license": "MIT", @@ -13,33 +13,23 @@ ], "require": { "php": ">=5.6", - "zendframework/zend-loader": "^2.4", - "zendframework/zend-servicemanager": "^2.4", - "zendframework/zend-modulemanager": "^2.4", - "zendframework/zend-mvc": "^2.4", - "zendframework/zend-view": "^2.4", - "zendframework/zend-serializer": "^2.4", - "zendframework/zend-log": "^2.4", - "zendframework/zend-i18n": "^2.4", - "zendframework/zend-http": "^2.4", - "zendframework/zend-console": "^2.4", - "dompdf/dompdf": "^0.8.0" + "dompdf/dompdf": "^0.8.0", + "zendframework/zend-mvc": "^3.0" }, "require-dev": { "phpunit/phpunit": "^4.8.27", "codeclimate/php-test-reporter": "^0.3.2", - "fabpot/php-cs-fixer": "^1.12", "squizlabs/php_codesniffer": "^2.7", "phpmd/phpmd": "^2.4" }, "autoload": { - "psr-0": { - "DOMPDFModule": "src/" + "psr-4": { + "DompdfModule\\": "src" } }, "autoload-dev": { - "psr-0": { - "DOMPDFModuleTest": "tests/" + "psr-4": { + "DompdfModule\\": "tests/DompdfModule" } } } diff --git a/composer.lock b/composer.lock index 9fd3d96..6f49421 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f2fea96a4da6988560bbbb47b7a3004c", + "content-hash": "c4def1d89471761b8f161d251aa44cc5", "packages": [ { "name": "container-interop/container-interop", @@ -225,53 +225,6 @@ ], "time": "2017-02-14T16:28:37+00:00" }, - { - "name": "psr/log", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2016-10-10T12:19:37+00:00" - }, { "name": "sabberworm/php-css-parser", "version": "8.1.0", @@ -317,73 +270,81 @@ "time": "2016-07-19T19:14:21+00:00" }, { - "name": "zendframework/zend-console", - "version": "2.5.1", + "name": "zendframework/zend-config", + "version": "3.1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-console.git", - "reference": "ad425c45444a76d6559df45df14291940c6883f1" + "url": "https://github.com/zendframework/zend-config.git", + "reference": "a12e4a592bf66d9629b84960e268f3752e53abe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-console/zipball/ad425c45444a76d6559df45df14291940c6883f1", - "reference": "ad425c45444a76d6559df45df14291940c6883f1", + "url": "https://api.github.com/repos/zendframework/zend-config/zipball/a12e4a592bf66d9629b84960e268f3752e53abe4", + "reference": "a12e4a592bf66d9629b84960e268f3752e53abe4", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" + "ext-json": "*", + "php": "^5.6 || ^7.0", + "psr/container": "^1.0", + "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + }, + "conflict": { + "container-interop/container-interop": "<1.2.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-json": "~2.5", - "zendframework/zend-validator": "~2.5" + "malukenho/docheader": "^0.1.5", + "phpunit/phpunit": "^5.7 || ^6.0", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-filter": "^2.7.1", + "zendframework/zend-i18n": "^2.7.3", + "zendframework/zend-servicemanager": "^2.7.8 || ^3.2.1" }, "suggest": { - "zendframework/zend-filter": "To support DefaultRouteMatcher usage", - "zendframework/zend-validator": "To support DefaultRouteMatcher usage" + "zendframework/zend-filter": "^2.7.1; install if you want to use the Filter processor", + "zendframework/zend-i18n": "^2.7.3; install if you want to use the Translator processor", + "zendframework/zend-servicemanager": "^2.7.8 || ^3.2.1; if you need an extensible plugin manager for use with the Config Factory" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { "psr-4": { - "Zend\\Console\\": "src/" + "Zend\\Config\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-console", + "description": "provides a nested object property based user interface for accessing this configuration data within application code", + "homepage": "https://github.com/zendframework/zend-config", "keywords": [ - "console", + "config", "zf2" ], - "time": "2015-06-03T15:32:00+00:00" + "time": "2017-02-22T14:31:10+00:00" }, { "name": "zendframework/zend-escaper", - "version": "2.5.1", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73" + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", - "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", "shasum": "" }, "require": { - "php": ">=5.3.23" + "php": ">=5.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", @@ -410,35 +371,41 @@ "escaper", "zf2" ], - "time": "2015-06-03T14:05:37+00:00" + "time": "2016-06-30T19:48:38+00:00" }, { "name": "zendframework/zend-eventmanager", - "version": "2.5.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "d94a16039144936f107f906896349900fd634443" + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d94a16039144936f107f906896349900fd634443", - "reference": "d94a16039144936f107f906896349900fd634443", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/9d72db10ceb6e42fb92350c0cb54460da61bd79c", + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "athletic/athletic": "^0.1", + "container-interop/container-interop": "^1.1.0", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0" + }, + "suggest": { + "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -450,174 +417,47 @@ "license": [ "BSD-3-Clause" ], + "description": "Trigger and listen to events within a PHP application", "homepage": "https://github.com/zendframework/zend-eventmanager", "keywords": [ + "event", "eventmanager", + "events", "zf2" ], - "time": "2015-06-03T15:32:01+00:00" - }, - { - "name": "zendframework/zend-filter", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-filter.git", - "reference": "93e6990a198e6cdd811064083acac4693f4b29ae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/93e6990a198e6cdd811064083acac4693f4b29ae", - "reference": "93e6990a198e6cdd811064083acac4693f4b29ae", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-crypt": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-loader": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-uri": "~2.5" - }, - "suggest": { - "zendframework/zend-crypt": "Zend\\Crypt component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Filter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a set of commonly needed data filters", - "homepage": "https://github.com/zendframework/zend-filter", - "keywords": [ - "filter", - "zf2" - ], - "time": "2015-06-03T15:32:01+00:00" - }, - { - "name": "zendframework/zend-form", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-form.git", - "reference": "a3b9151013e419e4401f66726746abdba174ed21" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-form/zipball/a3b9151013e419e4401f66726746abdba174ed21", - "reference": "a3b9151013e419e4401f66726746abdba174ed21", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-captcha": "~2.5", - "zendframework/zend-code": "~2.5", - "zendframework/zend-di": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-mvc": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-session": "~2.5", - "zendframework/zend-text": "~2.5", - "zendframework/zend-validator": "~2.5", - "zendframework/zend-view": "~2.5", - "zendframework/zendservice-recaptcha": "*" - }, - "suggest": { - "zendframework/zend-captcha": "Zend\\Captcha component", - "zendframework/zend-code": "Zend\\Code component", - "zendframework/zend-eventmanager": "Zend\\EventManager component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-validator": "Zend\\Validator component", - "zendframework/zend-view": "Zend\\View component", - "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Form\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-form", - "keywords": [ - "form", - "zf2" - ], - "time": "2015-06-03T15:32:01+00:00" + "time": "2017-07-11T19:17:22+00:00" }, { "name": "zendframework/zend-http", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-http.git", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678" + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/09f4d279f46d86be63171ff62ee0f79eca878678", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa", + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.5" + "php": "^5.6 || ^7.0", + "zendframework/zend-loader": "^2.5.1", + "zendframework/zend-stdlib": "^3.1 || ^2.7.7", + "zendframework/zend-uri": "^2.5.2", + "zendframework/zend-validator": "^2.10.1" }, "require-dev": { - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^6.4.1 || ^5.7.15", "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.5" + "zendframework/zend-config": "^3.1 || ^2.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "autoload": { @@ -632,179 +472,13 @@ "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", "homepage": "https://github.com/zendframework/zend-http", "keywords": [ + "ZendFramework", "http", - "zf2" - ], - "time": "2017-01-31T14:41:02+00:00" - }, - { - "name": "zendframework/zend-i18n", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "509271eb7947e4aabebfc376104179cffea42696" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/509271eb7947e4aabebfc376104179cffea42696", - "reference": "509271eb7947e4aabebfc376104179cffea42696", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-validator": "~2.5", - "zendframework/zend-view": "~2.5" - }, - "suggest": { - "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP", - "zendframework/zend-cache": "Zend\\Cache component", - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-eventmanager": "You should install this package to use the events in the translator", - "zendframework/zend-filter": "You should install this package to use the provided filters", - "zendframework/zend-resources": "Translation resources", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-validator": "You should install this package to use the provided validators", - "zendframework/zend-view": "You should install this package to use the provided view helpers" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\I18n\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-i18n", - "keywords": [ - "i18n", - "zf2" - ], - "time": "2015-06-03T15:32:01+00:00" - }, - { - "name": "zendframework/zend-inputfilter", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-inputfilter.git", - "reference": "b96ca3c3fb7894c36f440516f3be56d35772de92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/b96ca3c3fb7894c36f440516f3be56d35772de92", - "reference": "b96ca3c3fb7894c36f440516f3be56d35772de92", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-stdlib": "~2.5", - "zendframework/zend-validator": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-servicemanager": "To support plugin manager support" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\InputFilter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-inputfilter", - "keywords": [ - "inputfilter", - "zf2" - ], - "time": "2015-06-03T15:32:01+00:00" - }, - { - "name": "zendframework/zend-json", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc", - "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5", - "zendframework/zend-server": "~2.5", - "zendframework/zendxml": "~1.0" - }, - "suggest": { - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-server": "Zend\\Server component", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", - "keywords": [ - "json", - "zf2" + "http client", + "zend", + "zf" ], - "time": "2015-06-03T15:32:01+00:00" + "time": "2017-10-13T12:06:24+00:00" }, { "name": "zendframework/zend-loader", @@ -843,170 +517,53 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-loader", - "keywords": [ - "loader", - "zf2" - ], - "time": "2015-06-03T14:05:47+00:00" - }, - { - "name": "zendframework/zend-log", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-log.git", - "reference": "75bcfb813571705032571e2b471519b924b86fde" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-log/zipball/75bcfb813571705032571e2b471519b924b86fde", - "reference": "75bcfb813571705032571e2b471519b924b86fde", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "psr/log": "~1.0", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-console": "~2.5", - "zendframework/zend-db": "~2.5", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-mail": "~2.5", - "zendframework/zend-mvc": "~2.5", - "zendframework/zend-validator": "~2.5" - }, - "suggest": { - "ext-mongo": "mongodb extetension to use MongoDB writer", - "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor", - "zendframework/zend-db": "Zend\\Db component to use the database log writer", - "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", - "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", - "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Log\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "component for general purpose logging", - "homepage": "https://github.com/zendframework/zend-log", - "keywords": [ - "log", - "logging", - "zf2" - ], - "time": "2015-07-20T17:41:08+00:00" - }, - { - "name": "zendframework/zend-math", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-math.git", - "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-math/zipball/9f02a1ac4d3374d3332c80f9215deec9c71558fc", - "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc", - "shasum": "" - }, - "require": { - "php": ">=5.3.23" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "ircmaxell/random-lib": "~1.1", - "phpunit/phpunit": "~4.0", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "ext-bcmath": "If using the bcmath functionality", - "ext-gmp": "If using the gmp functionality", - "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable", - "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Math\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-math", + "homepage": "https://github.com/zendframework/zend-loader", "keywords": [ - "math", + "loader", "zf2" ], - "time": "2015-06-03T15:32:02+00:00" + "time": "2015-06-03T14:05:47+00:00" }, { "name": "zendframework/zend-modulemanager", - "version": "2.5.3", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-modulemanager.git", - "reference": "afaf873a3b420ba017933c15eb2a93dff433a7d1" + "reference": "710c13353b1ff0975777dbeb39bbf1c85e3353a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/afaf873a3b420ba017933c15eb2a93dff433a7d1", - "reference": "afaf873a3b420ba017933c15eb2a93dff433a7d1", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/710c13353b1ff0975777dbeb39bbf1c85e3353a3", + "reference": "710c13353b1ff0975777dbeb39bbf1c85e3353a3", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-stdlib": ">=2.5.0,<2.7.0" + "php": "^5.6 || ^7.0", + "zendframework/zend-config": "^3.1 || ^2.6", + "zendframework/zend-eventmanager": "^3.2 || ^2.6.3", + "zendframework/zend-stdlib": "^3.0 || ^2.7" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-console": "~2.5", - "zendframework/zend-di": "~2.5", - "zendframework/zend-loader": "~2.5", - "zendframework/zend-mvc": "~2.5", - "zendframework/zend-servicemanager": "~2.5" + "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5" }, "suggest": { - "zendframework/zend-config": "Zend\\Config component", "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-loader": "Zend\\Loader component", + "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules", "zendframework/zend-mvc": "Zend\\Mvc component", "zendframework/zend-servicemanager": "Zend\\ServiceManager component" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" } }, "autoload": { @@ -1023,76 +580,61 @@ "modulemanager", "zf2" ], - "time": "2015-09-22T17:21:13+00:00" + "time": "2017-11-01T18:30:41+00:00" }, { "name": "zendframework/zend-mvc", - "version": "2.5.3", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "bae0da8318323da7dd71d64aa8054f91f782951b" + "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/bae0da8318323da7dd71d64aa8054f91f782951b", - "reference": "bae0da8318323da7dd71d64aa8054f91f782951b", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/236e7e1e3757e988fa06530c0a3f96a148858ae8", + "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-form": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-stdlib": ">=2.5.0,<2.7.0" + "container-interop/container-interop": "^1.2", + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^3.2", + "zendframework/zend-http": "^2.7", + "zendframework/zend-modulemanager": "^2.8", + "zendframework/zend-router": "^3.0.2", + "zendframework/zend-servicemanager": "^3.3", + "zendframework/zend-stdlib": "^3.1", + "zendframework/zend-view": "^2.9" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-authentication": "~2.5", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-console": "~2.5", - "zendframework/zend-di": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-json": "~2.5", - "zendframework/zend-log": "~2.5", - "zendframework/zend-modulemanager": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-session": "~2.5", - "zendframework/zend-text": "~2.5", - "zendframework/zend-uri": "~2.5", - "zendframework/zend-validator": "~2.5", - "zendframework/zend-version": "~2.5", - "zendframework/zend-view": "~2.5" + "http-interop/http-middleware": "^0.4.1", + "phpunit/phpunit": "^6.4.4 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-json": "^2.6.1 || ^3.0", + "zendframework/zend-psr7bridge": "^1.0", + "zendframework/zend-stratigility": "^2.0.1" }, "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-di": "Zend\\Di component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-i18n": "Zend\\I18n component for translatable segments", - "zendframework/zend-inputfilter": "Zend\\Inputfilter component", - "zendframework/zend-json": "Zend\\Json component", - "zendframework/zend-log": "Zend\\Log component", - "zendframework/zend-modulemanager": "Zend\\ModuleManager component", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins", - "zendframework/zend-text": "Zend\\Text component", - "zendframework/zend-uri": "Zend\\Uri component", - "zendframework/zend-validator": "Zend\\Validator component", - "zendframework/zend-version": "Zend\\Version component", - "zendframework/zend-view": "Zend\\View component" + "http-interop/http-middleware": "^0.4.1 to be used together with zend-stratigility", + "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", + "zendframework/zend-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager", + "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", + "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments", + "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", + "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", + "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", + "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", + "zendframework/zend-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager", + "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", + "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application", + "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -1104,99 +646,119 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-mvc", + "description": "Zend Framework's event-driven MVC layer, including MVC Applications, Controllers, and Plugins", "keywords": [ + "ZendFramework", "mvc", - "zf2" + "zf" ], - "time": "2015-09-22T21:12:14+00:00" + "time": "2017-11-24T06:32:07+00:00" }, { - "name": "zendframework/zend-serializer", - "version": "2.5.1", + "name": "zendframework/zend-router", + "version": "3.0.2", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-serializer.git", - "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c" + "url": "https://github.com/zendframework/zend-router.git", + "reference": "03763610632a9022aff22a0e8f340852e68392a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/b7208eb17dc4a4fb3a660b85e6c4af035eeed40c", - "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c", + "url": "https://api.github.com/repos/zendframework/zend-router/zipball/03763610632a9022aff22a0e8f340852e68392a1", + "reference": "03763610632a9022aff22a0e8f340852e68392a1", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-json": "~2.5", - "zendframework/zend-math": "~2.5", - "zendframework/zend-stdlib": "~2.5" + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-http": "^2.5", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7.5 || ^3.0" + }, + "conflict": { + "zendframework/zend-mvc": "<3.0.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-servicemanager": "~2.5" + "phpunit/phpunit": "^4.5", + "sebastian/version": "^1.0.4", + "squizlabs/php_codesniffer": "^2.3", + "zendframework/zend-i18n": "^2.6" }, "suggest": { - "zendframework/zend-servicemanager": "To support plugin manager support" + "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + }, + "zf": { + "component": "Zend\\Router", + "config-provider": "Zend\\Router\\ConfigProvider" } }, "autoload": { "psr-4": { - "Zend\\Serializer\\": "src/" + "Zend\\Router\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", - "homepage": "https://github.com/zendframework/zend-serializer", + "homepage": "https://github.com/zendframework/zend-router", "keywords": [ - "serializer", + "mvc", + "routing", "zf2" ], - "time": "2015-06-03T15:32:02+00:00" + "time": "2016-05-31T20:47:48+00:00" }, { "name": "zendframework/zend-servicemanager", - "version": "2.7.8", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "2ae3b6e4978ec2e9ff52352e661946714ed989f9" + "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/2ae3b6e4978ec2e9ff52352e661946714ed989f9", - "reference": "2ae3b6e4978ec2e9ff52352e661946714ed989f9", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/c3036efb81f71bfa36cc9962ee5d4474f36581d0", + "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0", "shasum": "" }, "require": { - "container-interop/container-interop": "~1.0", - "php": "^5.5 || ^7.0" + "container-interop/container-interop": "^1.2", + "php": "^5.6 || ^7.0", + "psr/container": "^1.0", + "zendframework/zend-stdlib": "^3.1" + }, + "provide": { + "container-interop/container-interop-implementation": "^1.2", + "psr/container-implementation": "^1.0" }, "require-dev": { - "athletic/athletic": "dev-master", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-di": "~2.5", - "zendframework/zend-mvc": "~2.5" + "mikey179/vfsstream": "^1.6", + "ocramius/proxy-manager": "^1.0 || ^2.0", + "phpbench/phpbench": "^0.10.0", + "phpunit/phpunit": "^5.7 || ^6.0.6", + "zendframework/zend-coding-standard": "~1.0.0" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", - "zendframework/zend-di": "Zend\\Di component" + "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", + "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" }, + "bin": [ + "bin/generate-deps-for-config-factory", + "bin/generate-factory-for-class" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" + "dev-master": "3.3-dev", + "dev-develop": "3.4-dev" } }, "autoload": { @@ -1210,49 +772,39 @@ ], "homepage": "https://github.com/zendframework/zend-servicemanager", "keywords": [ + "service-manager", "servicemanager", - "zf2" + "zf" ], - "time": "2016-12-19T19:14:29+00:00" + "time": "2017-03-01T22:08:02+00:00" }, { "name": "zendframework/zend-stdlib", - "version": "2.5.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae" + "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cc8e90a60dd5d44b9730b77d07b97550091da1ae", - "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", + "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", "shasum": "" }, "require": { - "php": ">=5.3.23" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", + "athletic/athletic": "~0.1", "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + "squizlabs/php_codesniffer": "^2.6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -1269,26 +821,26 @@ "stdlib", "zf2" ], - "time": "2015-06-03T15:32:03+00:00" + "time": "2016-09-13T14:38:50+00:00" }, { "name": "zendframework/zend-uri", - "version": "2.5.1", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-uri.git", - "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572" + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fe6c7f4c8d9037fe551898a538a2b6d39483f572", - "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-validator": "~2.5" + "php": "^5.5 || ^7.0", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-validator": "^2.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", @@ -1316,55 +868,60 @@ "uri", "zf2" ], - "time": "2015-06-03T15:32:03+00:00" + "time": "2016-02-17T22:38:51+00:00" }, { "name": "zendframework/zend-validator", - "version": "2.5.1", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "f2c1a1fc786ff4533003cb7fac477495dc007120" + "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/f2c1a1fc786ff4533003cb7fac477495dc007120", - "reference": "f2c1a1fc786ff4533003cb7fac477495dc007120", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/010084ddbd33299bf51ea6f0e07f8f4e8bd832a8", + "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" + "container-interop/container-interop": "^1.1", + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7.6 || ^3.1" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-config": "~2.5", - "zendframework/zend-db": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-math": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-session": "~2.5", - "zendframework/zend-uri": "~2.5" + "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-db": "^2.7", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-math": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.8", + "zendframework/zend-uri": "^2.5" }, "suggest": { - "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator", "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", - "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", - "zendframework/zend-math": "Zend\\Math component", - "zendframework/zend-resources": "Translations of validator messages", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages", + "zendframework/zend-i18n-resources": "Translations of validator messages", + "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator", "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator", "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.10-dev", + "dev-develop": "2.11-dev" + }, + "zf": { + "component": "Zend\\Validator", + "config-provider": "Zend\\Validator\\ConfigProvider" } }, "autoload": { @@ -1382,51 +939,52 @@ "validator", "zf2" ], - "time": "2015-06-03T15:32:03+00:00" + "time": "2017-08-22T14:19:23+00:00" }, { "name": "zendframework/zend-view", - "version": "2.5.3", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-view.git", - "reference": "f1b682652045b126e0eb0852a1c9fb76b21dfcdd" + "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/f1b682652045b126e0eb0852a1c9fb76b21dfcdd", - "reference": "f1b682652045b126e0eb0852a1c9fb76b21dfcdd", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3b6342c381c4437a03fc81d0064c0bb8924914d3", + "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-loader": "~2.5", - "zendframework/zend-stdlib": "~2.5" + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-authentication": "~2.5", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-config": "~2.5", - "zendframework/zend-console": "~2.5", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-feed": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-json": "~2.5", - "zendframework/zend-log": "~2.5", - "zendframework/zend-modulemanager": "~2.5", - "zendframework/zend-mvc": "~2.5", - "zendframework/zend-navigation": "~2.5", - "zendframework/zend-paginator": "~2.5", - "zendframework/zend-permissions-acl": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-session": "dev-master", - "zendframework/zend-uri": "~2.5" + "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "zendframework/zend-authentication": "^2.5", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-console": "^2.6", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-feed": "^2.7", + "zendframework/zend-filter": "^2.6.1", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-log": "^2.7", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-mvc": "^2.7 || ^3.0", + "zendframework/zend-navigation": "^2.5", + "zendframework/zend-paginator": "^2.5", + "zendframework/zend-permissions-acl": "^2.6", + "zendframework/zend-router": "^3.0.1", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-uri": "^2.5" }, "suggest": { "zendframework/zend-authentication": "Zend\\Authentication component", @@ -1443,11 +1001,14 @@ "zendframework/zend-servicemanager": "Zend\\ServiceManager component", "zendframework/zend-uri": "Zend\\Uri component" }, + "bin": [ + "bin/templatemap_generator.php" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.9-dev", + "dev-develop": "3.0-dev" } }, "autoload": { @@ -1465,7 +1026,7 @@ "view", "zf2" ], - "time": "2016-01-19T20:49:13+00:00" + "time": "2017-03-21T15:05:56+00:00" } ], "packages-dev": [ @@ -1581,65 +1142,6 @@ ], "time": "2015-06-14T21:17:01+00:00" }, - { - "name": "fabpot/php-cs-fixer", - "version": "v1.12.3", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "78a820c16d13f593303511461eefa939502fb2de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/78a820c16d13f593303511461eefa939502fb2de", - "reference": "78a820c16d13f593303511461eefa939502fb2de", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.1 || ^3.0", - "symfony/finder": "^2.1 || ^3.0", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" - }, - "conflict": { - "hhvm": "<3.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.5|^5", - "satooshi/php-coveralls": "^1.0" - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "autoload": { - "psr-4": { - "Symfony\\CS\\": "Symfony/CS/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A tool to automatically fix PHP code style", - "abandoned": "friendsofphp/php-cs-fixer", - "time": "2016-10-30T12:07:10+00:00" - }, { "name": "guzzle/guzzle", "version": "v3.9.3", @@ -1738,16 +1240,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.2.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "b086687f3a01dc6bb92d633aef071d2c5dd0db06" + "reference": "0c50874333149c0dad5a2877801aed148f2767ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/b086687f3a01dc6bb92d633aef071d2c5dd0db06", - "reference": "b086687f3a01dc6bb92d633aef071d2c5dd0db06", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff", + "reference": "0c50874333149c0dad5a2877801aed148f2767ff", "shasum": "" }, "require": { @@ -1774,7 +1276,7 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2016-03-10T15:15:04+00:00" + "time": "2017-01-19T14:23:36+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -1827,21 +1329,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.4.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e" + "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/2b9c2417a18696dfb578b38c116cd0ddc19b256e", - "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374", + "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374", "shasum": "" }, "require": { - "pdepend/pdepend": "^2.0.4", - "php": ">=5.3.0" + "ext-xml": "*", + "pdepend/pdepend": "^2.5", + "php": ">=5.3.9" }, "require-dev": { "phpunit/phpunit": "^4.0", @@ -1888,7 +1391,7 @@ "phpmd", "pmd" ], - "time": "2016-04-04T11:52:04+00:00" + "time": "2017-01-20T14:41:10+00:00" }, { "name": "phpspec/prophecy", @@ -2323,6 +1826,53 @@ ], "time": "2015-10-02T06:51:40+00:00" }, + { + "name": "psr/log", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2016-10-10T12:19:37+00:00" + }, { "name": "satooshi/php-coveralls", "version": "v1.0.1", @@ -2447,23 +1997,23 @@ }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -2495,7 +2045,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -2755,16 +2305,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.7.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed", - "reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -2829,25 +2379,28 @@ "phpcs", "standards" ], - "time": "2016-09-01T23:53:02+00:00" + "time": "2017-05-22T02:43:20+00:00" }, { "name": "symfony/config", - "version": "v2.8.13", + "version": "v3.2.14", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde" + "reference": "e5533fcc0b3dd377626153b2852707878f363728" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde", - "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde", + "url": "https://api.github.com/repos/symfony/config/zipball/e5533fcc0b3dd377626153b2852707878f363728", + "reference": "e5533fcc0b3dd377626153b2852707878f363728", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/filesystem": "~2.3|~3.0.0" + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" + }, + "require-dev": { + "symfony/yaml": "~3.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -2855,7 +2408,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2882,41 +2435,43 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-09-14T20:31:12+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/console", - "version": "v2.8.13", + "version": "v3.2.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7350016c8abcab897046f1aead2b766b84d3eff8" + "reference": "eced439413608647aeff243038a33ea246b2b33a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7350016c8abcab897046f1aead2b766b84d3eff8", - "reference": "7350016c8abcab897046f1aead2b766b84d3eff8", + "url": "https://api.github.com/repos/symfony/console/zipball/eced439413608647aeff243038a33ea246b2b33a", + "reference": "eced439413608647aeff243038a33ea246b2b33a", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/debug": "~2.7,>=2.7.2|~3.0.0", + "php": ">=5.5.9", + "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/filesystem": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/filesystem": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2943,37 +2498,36 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-10-06T01:43:09+00:00" + "time": "2017-07-29T21:27:41+00:00" }, { "name": "symfony/debug", - "version": "v2.8.13", + "version": "v3.3.13", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c" + "reference": "74557880e2846b5c84029faa96b834da37e29810" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/8c29235936a47473af16fb91c7c4b7b193c5693c", - "reference": "8c29235936a47473af16fb91c7c4b7b193c5693c", + "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810", + "reference": "74557880e2846b5c84029faa96b834da37e29810", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.2|~3.0.0", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0" + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3000,32 +2554,29 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-09-06T10:55:00+00:00" + "time": "2017-11-10T16:38:39+00:00" }, { "name": "symfony/dependency-injection", - "version": "v2.8.13", + "version": "v3.1.10", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c" + "reference": "f4a04433f82eb8ca58555d1b6375293fc7c90d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3d61c765daa1a5832f1d7c767f48886b8d8ea64c", - "reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f4a04433f82eb8ca58555d1b6375293fc7c90d18", + "reference": "f4a04433f82eb8ca58555d1b6375293fc7c90d18", "shasum": "" }, "require": { - "php": ">=5.3.9" - }, - "conflict": { - "symfony/expression-language": "<2.6" + "php": ">=5.5.9" }, "require-dev": { - "symfony/config": "~2.2|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7" + "symfony/config": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/yaml": "~2.8.7|~3.0.7|~3.1.1|~3.2" }, "suggest": { "symfony/config": "", @@ -3036,7 +2587,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -3063,20 +2614,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-10-24T15:52:36+00:00" + "time": "2017-01-28T00:04:57+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.13", + "version": "v2.8.31", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934" + "reference": "b59aacf238fadda50d612c9de73b74751872a903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934", - "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903", + "reference": "b59aacf238fadda50d612c9de73b74751872a903", "shasum": "" }, "require": { @@ -3084,7 +2635,7 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/config": "^2.0.5|~3.0.0", "symfony/dependency-injection": "~2.6|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0" @@ -3123,29 +2674,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-10-13T01:43:15+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/filesystem", - "version": "v2.8.13", + "version": "v3.3.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "a3784111af9f95f102b6411548376e1ae7c93898" + "reference": "77db266766b54db3ee982fe51868328b887ce15c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/a3784111af9f95f102b6411548376e1ae7c93898", - "reference": "a3784111af9f95f102b6411548376e1ae7c93898", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/77db266766b54db3ee982fe51868328b887ce15c", + "reference": "77db266766b54db3ee982fe51868328b887ce15c", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3172,69 +2723,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-10-18T04:28:30+00:00" - }, - { - "name": "symfony/finder", - "version": "v2.8.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/bc24c8f5674c6f6841f2856b70e5d60784be5691", - "reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2016-09-28T00:10:16+00:00" + "time": "2017-11-07T14:12:55+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", - "reference": "dff51f72b0706335131b00a7f49606168c582594", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", "shasum": "" }, "require": { @@ -3246,7 +2748,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -3280,78 +2782,29 @@ "portable", "shim" ], - "time": "2016-05-18T14:26:46+00:00" - }, - { - "name": "symfony/process", - "version": "v2.8.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f", - "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com", - "time": "2016-09-29T14:03:54+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/stopwatch", - "version": "v2.8.13", + "version": "v3.3.13", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "35bae476693150728b0eb51647faac82faf9aaca" + "reference": "1e93c3139ef6c799831fe03efd0fb1c7aecb3365" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/35bae476693150728b0eb51647faac82faf9aaca", - "reference": "35bae476693150728b0eb51647faac82faf9aaca", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/1e93c3139ef6c799831fe03efd0fb1c7aecb3365", + "reference": "1e93c3139ef6c799831fe03efd0fb1c7aecb3365", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3378,7 +2831,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2016-06-29T05:29:29+00:00" + "time": "2017-11-10T19:02:53+00:00" }, { "name": "symfony/yaml", diff --git a/config/module.config.php b/config/module.config.php index c732e8a..9d797a9 100644 --- a/config/module.config.php +++ b/config/module.config.php @@ -17,7 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule; +namespace DompdfModule; return [ 'dompdf_module' => [ @@ -271,15 +271,15 @@ 'service_manager' => [ 'shared' => [ /** - * DOMPDF itself has issues rendering twice in a row so we force a + * Dompdf itself has issues rendering twice in a row so we force a * new instance to be created. */ - 'DOMPDF' => false + 'Dompdf' => false ], 'factories' => [ - 'DOMPDF' => __NAMESPACE__ . '\Service\DOMPDFFactory', - 'ViewPdfRenderer' => __NAMESPACE__ . '\Mvc\Service\ViewPdfRendererFactory', - 'ViewPdfStrategy' => __NAMESPACE__ . '\Mvc\Service\ViewPdfStrategyFactory', + 'Dompdf' => Service\DompdfFactory::class, + 'ViewPdfRenderer' => Mvc\Service\ViewPdfRendererFactory::class, + 'ViewPdfStrategy' => Mvc\Service\ViewPdfStrategyFactory::class ] ] ]; diff --git a/src/DOMPDFModule/Module.php b/src/DOMPDFModule/Module.php deleted file mode 100644 index 997e512..0000000 --- a/src/DOMPDFModule/Module.php +++ /dev/null @@ -1,42 +0,0 @@ - - * @copyright Copyright (c) 2012 University of Maine, 2016 Raymond J. Kolbe - * @license http://www.opensource.org/licenses/mit-license.php MIT License - */ - -namespace DOMPDFModule; - -class Module -{ - /** - * @return array - */ - public function getConfig() - { - return include __DIR__ . '/../../config/module.config.php'; - } - - public function getAutoloaderConfig() - { - return [ - 'Zend\Loader\StandardAutoloader' => [ - 'namespaces' => [ - __NAMESPACE__ => __DIR__ , - ] - ] - ]; - } -} diff --git a/Module.php b/src/Module.php similarity index 78% rename from Module.php rename to src/Module.php index 56290ac..15901f9 100644 --- a/Module.php +++ b/src/Module.php @@ -17,4 +17,17 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -require_once __DIR__ . '/src/DOMPDFModule/Module.php'; \ No newline at end of file +namespace DompdfModule; + +use Zend\ModuleManager\Feature\ConfigProviderInterface; + +class Module implements ConfigProviderInterface +{ + /** + * @return array + */ + public function getConfig() + { + return include __DIR__ . '/../config/module.config.php'; + } +} diff --git a/src/DOMPDFModule/Mvc/Service/ViewPdfRendererFactory.php b/src/Mvc/Service/ViewPdfRendererFactory.php similarity index 65% rename from src/DOMPDFModule/Mvc/Service/ViewPdfRendererFactory.php rename to src/Mvc/Service/ViewPdfRendererFactory.php index 37efbe4..29fa985 100644 --- a/src/DOMPDFModule/Mvc/Service/ViewPdfRendererFactory.php +++ b/src/Mvc/Service/ViewPdfRendererFactory.php @@ -18,25 +18,28 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\Mvc\Service; +namespace DompdfModule\Mvc\Service; -use Zend\ServiceManager\FactoryInterface; -use Zend\ServiceManager\ServiceLocatorInterface; -use DOMPDFModule\View\Renderer\PdfRenderer; +use Zend\ServiceManager\Factory\FactoryInterface; +use Interop\Container\ContainerInterface; +use DompdfModule\View\Renderer\PdfRenderer; class ViewPdfRendererFactory implements FactoryInterface { /** - * Create and return the PDF view renderer + * Create and return the PDF view renderer. * - * @param ServiceLocatorInterface $serviceLocator + * @SuppressWarnings("unused") + * @param ContainerInterface $container + * @param string $requestedName + * @param array|null $options * @return PdfRenderer */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { return (new PdfRenderer()) - ->setResolver($serviceLocator->get('ViewResolver')) - ->setHtmlRenderer($serviceLocator->get('ViewRenderer')) - ->setEngine($serviceLocator->get('dompdf')); + ->setResolver($container->get('ViewResolver')) + ->setHtmlRenderer($container->get('ViewRenderer')) + ->setEngine($container->get('Dompdf')); } } diff --git a/src/DOMPDFModule/Mvc/Service/ViewPdfStrategyFactory.php b/src/Mvc/Service/ViewPdfStrategyFactory.php similarity index 72% rename from src/DOMPDFModule/Mvc/Service/ViewPdfStrategyFactory.php rename to src/Mvc/Service/ViewPdfStrategyFactory.php index 29467f9..3b771aa 100644 --- a/src/DOMPDFModule/Mvc/Service/ViewPdfStrategyFactory.php +++ b/src/Mvc/Service/ViewPdfStrategyFactory.php @@ -17,11 +17,11 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\Mvc\Service; +namespace DompdfModule\Mvc\Service; -use Zend\ServiceManager\FactoryInterface; -use Zend\ServiceManager\ServiceLocatorInterface; -use DOMPDFModule\View\Strategy\PdfStrategy; +use Zend\ServiceManager\Factory\FactoryInterface; +use Interop\Container\ContainerInterface; +use DompdfModule\View\Strategy\PdfStrategy; class ViewPdfStrategyFactory implements FactoryInterface { @@ -31,11 +31,14 @@ class ViewPdfStrategyFactory implements FactoryInterface * Retrieves the ViewPdfRenderer service from the service locator, and * injects it into the constructor for the PDF strategy. * - * @param ServiceLocatorInterface $serviceLocator + * @SuppressWarnings("unused") + * @param ContainerInterface $container + * @param string $requestedName + * @param array|null $options * @return PdfStrategy */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { - return new PdfStrategy($serviceLocator->get('ViewPdfRenderer')); + return new PdfStrategy($container->get('ViewPdfRenderer')); } } diff --git a/src/DOMPDFModule/Service/DOMPDFFactory.php b/src/Service/DompdfFactory.php similarity index 86% rename from src/DOMPDFModule/Service/DOMPDFFactory.php rename to src/Service/DompdfFactory.php index 3cd0a06..390c7d7 100644 --- a/src/DOMPDFModule/Service/DOMPDFFactory.php +++ b/src/Service/DompdfFactory.php @@ -17,24 +17,27 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\Service; +namespace DompdfModule\Service; use Dompdf\Dompdf; use Dompdf\Options; -use Zend\ServiceManager\FactoryInterface; -use Zend\ServiceManager\ServiceLocatorInterface; +use Zend\ServiceManager\Factory\FactoryInterface; +use Interop\Container\ContainerInterface; -class DOMPDFFactory implements FactoryInterface +class DompdfFactory implements FactoryInterface { /** * Creates an instance of Dompdf. * - * @param ServiceLocatorInterface $serviceLocator + * @SuppressWarnings("unused") + * @param ContainerInterface $container + * @param string $requestedName + * @param array|null $options * @return Dompdf */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { - $moduleConfig = $serviceLocator->get('config')['dompdf_module']; + $moduleConfig = $container->get('config')['dompdf_module']; $options = [ 'temp_dir' => $moduleConfig['temporary_directory'], diff --git a/src/DOMPDFModule/View/Model/PdfModel.php b/src/View/Model/PdfModel.php similarity index 98% rename from src/DOMPDFModule/View/Model/PdfModel.php rename to src/View/Model/PdfModel.php index 7461e73..2ca3799 100644 --- a/src/DOMPDFModule/View/Model/PdfModel.php +++ b/src/View/Model/PdfModel.php @@ -17,7 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\View\Model; +namespace DompdfModule\View\Model; use Zend\View\Model\ViewModel; diff --git a/src/DOMPDFModule/View/Renderer/PdfRenderer.php b/src/View/Renderer/PdfRenderer.php similarity index 97% rename from src/DOMPDFModule/View/Renderer/PdfRenderer.php rename to src/View/Renderer/PdfRenderer.php index d52af26..cc735b1 100644 --- a/src/DOMPDFModule/View/Renderer/PdfRenderer.php +++ b/src/View/Renderer/PdfRenderer.php @@ -17,9 +17,9 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\View\Renderer; +namespace DompdfModule\View\Renderer; -use DOMPDFModule\View\Model\PdfModel; +use DompdfModule\View\Model\PdfModel; use Zend\View\Exception\InvalidArgumentException; use Zend\View\Renderer\RendererInterface as Renderer; use Zend\View\Resolver\ResolverInterface as Resolver; diff --git a/src/DOMPDFModule/View/Strategy/PdfStrategy.php b/src/View/Strategy/PdfStrategy.php similarity index 84% rename from src/DOMPDFModule/View/Strategy/PdfStrategy.php rename to src/View/Strategy/PdfStrategy.php index cb89cc6..10b99f2 100644 --- a/src/DOMPDFModule/View/Strategy/PdfStrategy.php +++ b/src/View/Strategy/PdfStrategy.php @@ -17,21 +17,17 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\View\Strategy; +namespace DompdfModule\View\Strategy; -use DOMPDFModule\View\Model; -use DOMPDFModule\View\Renderer\PdfRenderer; +use DompdfModule\View\Model; +use DompdfModule\View\Renderer\PdfRenderer; +use Zend\EventManager\AbstractListenerAggregate; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; use Zend\View\ViewEvent; -class PdfStrategy implements ListenerAggregateInterface +class PdfStrategy extends AbstractListenerAggregate implements ListenerAggregateInterface { - /** - * @var \Zend\Stdlib\CallbackHandler[] - */ - protected $listeners = []; - /** * @var PdfRenderer */ @@ -61,21 +57,6 @@ public function attach(EventManagerInterface $events, $priority = 1) $this->listeners[] = $events->attach(ViewEvent::EVENT_RESPONSE, [$this, 'injectResponse'], $priority); } - /** - * Detach aggregate listeners from the specified event manager - * - * @param EventManagerInterface $events - * @return void - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } - } - /** * Detect if we should use the PdfRenderer based on model type * diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 4da6ea4..723fedb 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -17,9 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -use DOMPDFModuleTest\Framework\TestCase; -use Zend\ServiceManager\ServiceManager; -use Zend\Mvc\Service\ServiceManagerConfig; +use DompdfModule\Framework\TestCase; ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); diff --git a/tests/DOMPDFModuleTest/Framework/TestCase.php b/tests/DompdfModule/Framework/TestCase.php similarity index 97% rename from tests/DOMPDFModuleTest/Framework/TestCase.php rename to tests/DompdfModule/Framework/TestCase.php index c36a290..78f1310 100644 --- a/tests/DOMPDFModuleTest/Framework/TestCase.php +++ b/tests/DompdfModule/Framework/TestCase.php @@ -17,7 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\Framework; +namespace DompdfModule\Framework; use Zend\ServiceManager\ServiceManager; diff --git a/tests/DOMPDFModuleTest/ModuleTest.php b/tests/DompdfModule/ModuleTest.php similarity index 84% rename from tests/DOMPDFModuleTest/ModuleTest.php rename to tests/DompdfModule/ModuleTest.php index 1320c61..f6d6c7c 100644 --- a/tests/DOMPDFModuleTest/ModuleTest.php +++ b/tests/DompdfModule/ModuleTest.php @@ -17,9 +17,9 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest; +namespace DompdfModule; -use DOMPDFModule\Module; +use Zend\ModuleManager\Feature\ConfigProviderInterface; class ModuleTest extends \PHPUnit_Framework_TestCase { @@ -32,17 +32,11 @@ public function testHasConfig() { $config = $this->module->getConfig(); - // Test the obvious required keys. + $this->assertInstanceOf(ConfigProviderInterface::class, $this->module); $this->assertArrayHasKey('dompdf_module', $config, 'dompdf_module'); $this->assertArrayHasKey('service_manager', $config, 'service_manager'); } - public function testHasAutoloaderConfig() - { - $config = $this->module->getAutoloaderConfig(); - $this->assertInternalType('array', $config, 'config is array'); - } - /** * {@inheritDoc} */ diff --git a/tests/DOMPDFModuleTest/Mvc/Service/ViewPdfRendererFactoryTest.php b/tests/DompdfModule/Mvc/Service/ViewPdfRendererFactoryTest.php similarity index 76% rename from tests/DOMPDFModuleTest/Mvc/Service/ViewPdfRendererFactoryTest.php rename to tests/DompdfModule/Mvc/Service/ViewPdfRendererFactoryTest.php index 761e33d..c366677 100644 --- a/tests/DOMPDFModuleTest/Mvc/Service/ViewPdfRendererFactoryTest.php +++ b/tests/DompdfModule/Mvc/Service/ViewPdfRendererFactoryTest.php @@ -17,10 +17,10 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\Mvc\Service; +namespace DompdfModule\Mvc\Service; -use DOMPDFModule\Mvc\Service\ViewPdfRendererFactory; -use DOMPDFModuleTest\Framework\TestCase; +use DompdfModule\View\Renderer\PdfRenderer; +use DompdfModule\Framework\TestCase; class ViewPdfRendererFactoryTest extends TestCase { @@ -28,9 +28,9 @@ public function testCreatesService() { $factory = new ViewPdfRendererFactory(); - /* @var $instance \DOMPDFModule\View\Renderer\PdfRenderer */ - $instance = $factory->createService($this->getServiceManager()); + /* @var $instance \DompdfModule\View\Renderer\PdfRenderer */ + $instance = $factory($this->getServiceManager(), 'ViewPdfStrategy'); - $this->assertInstanceOf('\DOMPDFModule\View\Renderer\PdfRenderer', $instance); + $this->assertInstanceOf(PdfRenderer::class, $instance); } } diff --git a/tests/DOMPDFModuleTest/Mvc/Service/ViewPdfStrategyFactoryTest.php b/tests/DompdfModule/Mvc/Service/ViewPdfStrategyFactoryTest.php similarity index 76% rename from tests/DOMPDFModuleTest/Mvc/Service/ViewPdfStrategyFactoryTest.php rename to tests/DompdfModule/Mvc/Service/ViewPdfStrategyFactoryTest.php index a4735b0..e91d7f4 100644 --- a/tests/DOMPDFModuleTest/Mvc/Service/ViewPdfStrategyFactoryTest.php +++ b/tests/DompdfModule/Mvc/Service/ViewPdfStrategyFactoryTest.php @@ -17,10 +17,10 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\Mvc\Service; +namespace DompdfModule\Mvc\Service; -use DOMPDFModule\Mvc\Service\ViewPdfStrategyFactory; -use DOMPDFModuleTest\Framework\TestCase; +use DompdfModule\Framework\TestCase; +use DompdfModule\View\Strategy\PdfStrategy; class ViewPdfStrategyFactoryTest extends TestCase { @@ -28,9 +28,9 @@ public function testCreatesService() { $factory = new ViewPdfStrategyFactory(); - /* @var $instance \DOMPDFModule\View\Strategy\PdfStrategy */ - $instance = $factory->createService($this->getServiceManager()); + /* @var $instance \DompdfModule\View\Strategy\PdfStrategy */ + $instance = $factory($this->getServiceManager(), 'ViewPdfStrategy'); - $this->assertInstanceOf('\DOMPDFModule\View\Strategy\PdfStrategy', $instance); + $this->assertInstanceOf(PdfStrategy::class, $instance); } } diff --git a/tests/DOMPDFModuleTest/Service/DOMPDFFactoryTest.php b/tests/DompdfModule/Service/DompdfFactoryTest.php similarity index 83% rename from tests/DOMPDFModuleTest/Service/DOMPDFFactoryTest.php rename to tests/DompdfModule/Service/DompdfFactoryTest.php index 51c5cf8..2db6278 100644 --- a/tests/DOMPDFModuleTest/Service/DOMPDFFactoryTest.php +++ b/tests/DompdfModule/Service/DompdfFactoryTest.php @@ -17,12 +17,12 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModule\Service; +namespace DompdfModule\Service; use Dompdf\Dompdf; -use DOMPDFModuleTest\Framework\TestCase; +use DompdfModule\Framework\TestCase; -class DOMPDFFactoryTest extends TestCase +class DompdfFactoryTest extends TestCase { /** * System under test. @@ -33,16 +33,24 @@ class DOMPDFFactoryTest extends TestCase public function testItCreatesAValidInstance() { - $dompdf = $this->factory->createService($this->getServiceManager()); + $factory = $this->factory; - $this->assertInstanceOf('\Dompdf\Dompdf', $dompdf); - $this->assertNotNullOptions($dompdf); + /* @var $instance Dompdf */ + $instance = $factory($this->getServiceManager(), 'Dompdf'); + + $this->assertInstanceOf(Dompdf::class, $instance); + $this->assertNotNullOptions($instance); } public function testItCreatesUniqueInstances() { - $firstInstance = $this->factory->createService($this->getServiceManager()); - $secondInstance = $this->factory->createService($this->getServiceManager()); + $factory = $this->factory; + + /* @var $firstInstance Dompdf */ + $firstInstance = $factory($this->getServiceManager(), 'Dompdf'); + + /* @var $secondInstance Dompdf */ + $secondInstance = $factory($this->getServiceManager(), 'Dompdf'); $this->assertNotSame($firstInstance, $secondInstance); } @@ -54,11 +62,11 @@ protected function setUp() { parent::setUp(); - $this->factory = new DOMPDFFactory(); + $this->factory = new DompdfFactory(); } /** - * Asserts that the given DOMPDF instance contains not null options for has options set. + * Asserts that the given Dompdf instance contains not null options for has options set. * * @param Dompdf $dompdf */ diff --git a/tests/DOMPDFModuleTest/View/Model/PdfModelTest.php b/tests/DompdfModule/View/Model/PdfModelTest.php similarity index 96% rename from tests/DOMPDFModuleTest/View/Model/PdfModelTest.php rename to tests/DompdfModule/View/Model/PdfModelTest.php index eece70a..e333b75 100644 --- a/tests/DOMPDFModuleTest/View/Model/PdfModelTest.php +++ b/tests/DompdfModule/View/Model/PdfModelTest.php @@ -17,9 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\View\Model; - -use DOMPDFModule\View\Model\PdfModel; +namespace DompdfModule\View\Model; class PdfModelTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/DOMPDFModuleTest/View/Renderer/PdfRendererTest.php b/tests/DompdfModule/View/Renderer/PdfRendererTest.php similarity index 95% rename from tests/DOMPDFModuleTest/View/Renderer/PdfRendererTest.php rename to tests/DompdfModule/View/Renderer/PdfRendererTest.php index a6aa8b6..ba5b265 100644 --- a/tests/DOMPDFModuleTest/View/Renderer/PdfRendererTest.php +++ b/tests/DompdfModule/View/Renderer/PdfRendererTest.php @@ -17,12 +17,12 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\View\Strategy; +namespace DompdfModule\View\Strategy; use Zend\View\Model\JsonModel; -use DOMPDFModuleTest\Framework\TestCase; -use DOMPDFModule\View\Model\PdfModel; -use DOMPDFModule\View\Renderer\PdfRenderer; +use DompdfModule\Framework\TestCase; +use DompdfModule\View\Model\PdfModel; +use DompdfModule\View\Renderer\PdfRenderer; class PdfRendererTest extends TestCase { diff --git a/tests/DOMPDFModuleTest/View/Strategy/PdfStrategyTest.php b/tests/DompdfModule/View/Strategy/PdfStrategyTest.php similarity index 96% rename from tests/DOMPDFModuleTest/View/Strategy/PdfStrategyTest.php rename to tests/DompdfModule/View/Strategy/PdfStrategyTest.php index 7f545ee..bf4707c 100644 --- a/tests/DOMPDFModuleTest/View/Strategy/PdfStrategyTest.php +++ b/tests/DompdfModule/View/Strategy/PdfStrategyTest.php @@ -17,7 +17,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace DOMPDFModuleTest\View\Strategy; +namespace DompdfModule\View\Strategy; use Zend\Stdlib\ResponseInterface; use Zend\View\Model\ViewModel; @@ -25,10 +25,9 @@ use Zend\View\Renderer\PhpRenderer; use Zend\View\ViewEvent; use Zend\Http\Response as HttpResponse; -use DOMPDFModuleTest\Framework\TestCase; -use DOMPDFModule\View\Model\PdfModel; -use DOMPDFModule\View\Renderer\PdfRenderer; -use DOMPDFModule\View\Strategy\PdfStrategy; +use DompdfModule\Framework\TestCase; +use DompdfModule\View\Model\PdfModel; +use DompdfModule\View\Renderer\PdfRenderer; class PdfStrategyTest extends TestCase { @@ -178,7 +177,7 @@ protected function setUp() $htmlRenderer = new PhpRenderer(); $htmlRenderer->setResolver($this->resolver); $this->renderer->setHtmlRenderer($htmlRenderer); - $this->renderer->setEngine($this->getServiceManager()->get('dompdf')); + $this->renderer->setEngine($this->getServiceManager()->get('Dompdf')); } private function execute(PdfStrategy $strategy, ViewEvent $event, PdfModel $model) diff --git a/tests/DOMPDFModuleTest/View/_templates/basic.phtml b/tests/DompdfModule/View/_templates/basic.phtml similarity index 100% rename from tests/DOMPDFModuleTest/View/_templates/basic.phtml rename to tests/DompdfModule/View/_templates/basic.phtml diff --git a/tests/TestConfiguration.php.dist b/tests/TestConfiguration.php.dist index 1035b1f..a9a409b 100644 --- a/tests/TestConfiguration.php.dist +++ b/tests/TestConfiguration.php.dist @@ -17,21 +17,20 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -define('DOMPDF_DIR', __DIR__ . '/../vendor/dompdf/dompdf'); - -return array( - 'modules' => array( - 'DOMPDFModule', - ), - 'module_listener_options' => array( +return [ + 'modules' => [ + 'DompdfModule', + 'Zend\Router' + ], + 'module_listener_options' => [ 'config_cache_enabled' => false, 'cache_dir' => 'data/cache', - 'module_paths' => array( + 'module_paths' => [ './vendor', './module' - ), - ), - 'service_manager' => array( + ], + ], + 'service_manager' => [ 'use_defaults' => true, - ), -); \ No newline at end of file + ], +]; \ No newline at end of file diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 8d59b01..28ede3a 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -4,7 +4,7 @@ backupGlobals="false" > - + ./