Merge pull request #2 from netiul/zf3

Added support for zend framework 3

Author: zluiten

.gitignore

@@ -1,5 +1,6 @@
 # Composer files
 composer.phar
+composer.lock
 vendor/
 
 # Local configs

.travis.yml

@@ -1,17 +1,17 @@
 language: php
 
 env:
-  - ZF_VERSION=^2.4
-  - ZF_VERSION=2.4.*
-  - ZF_VERSION=2.5.*
+  - FLAG=
+  - FLAG=--prefer-lowest
+  - FLAG=--prefer-stable
 
 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}
+  - composer update ${FLAG}
 
 script: ./build.sh
 

Dockerfile

@@ -4,15 +4,30 @@ FROM php:${PHP_VERSION}
 ENV COMPOSER_HOME=/var/lib/composer
 WORKDIR /opt/app
 
-RUN apt-get update -y && \
-    apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev && \
-    pecl install xdebug-2.5.0 && \
-    docker-php-ext-install -j$(nproc) zip gd && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
-    docker-php-ext-enable xdebug && \
-    php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && \
-    php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); exit(1); } echo PHP_EOL;" && \
-    php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && \
-    rm -rf /tmp/composer-setup.php
+RUN apt-get update -y \
+   && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev \
+   && pecl install xdebug-2.5.0 \
+   && docker-php-ext-install -j$(nproc) zip gd \
+   && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+   && docker-php-ext-enable xdebug
+
+RUN { \
+        echo '#!/bin/sh'; \
+        echo 'EXPECTED_SIGNATURE="$(curl -s https://composer.github.io/installer.sig)"'; \
+        echo 'php -r "copy('\''https://getcomposer.org/installer'\'', '\''composer-setup.php'\'');"'; \
+        echo 'ACTUAL_SIGNATURE="$(php -r "echo hash_file('\''sha384'\'', '\''composer-setup.php'\'');")"'; \
+        echo 'if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then'; \
+        echo '  >&2 echo '\''ERROR: Invalid installer signature'\'''; \
+        echo '  rm composer-setup.php'; \
+        echo '  exit 1'; \
+        echo 'fi'; \
+        echo 'php composer-setup.php --quiet --install-dir=/usr/local/bin --filename=composer'; \
+        echo 'RESULT=$?'; \
+        echo 'rm composer-setup.php'; \
+        echo 'exit $RESULT'; \
+   } | tee /composer-install.sh \
+   && chmod +x /composer-install.sh \
+   && /composer-install.sh \
+   && rm /composer-install.sh
 
 ENTRYPOINT ["./build.sh" ]

README.md

@@ -15,19 +15,11 @@ PHP Composer, please visit the official [PHP Composer site](http://getcomposer.o
 #### Installation steps
 
   1. `cd my/project/directory`
-  2. create a `composer.json` file with following contents:
-
-     ```json
-     {
-         "require": {
-             "netiul/dompdf-module": "^0.4"
-         }
-     }
-     ```
-  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`: 
+  2. Add the module to the project by:
+  
+    composer require netiul/dompdf-module
+
+  3. open `my/project/directory/config/application.config.php` and add the following key to your `modules`: 
 
      ```php
      'DOMPDFModule',

build.sh

@@ -114,7 +114,7 @@ echo "Verifying source...";
 ${VENDOR_BIN}/phpcs --standard=PSR2 src
 ${VENDOR_BIN}/phpcs --standard=PSR2 config
 ${VENDOR_BIN}/phpcs --standard=PSR2 tests
-${VENDOR_BIN}/phpmd config,src,tests text cleancode,codesize,controversial,design,naming,unusedcode
+${VENDOR_BIN}/phpmd config,src,tests text cleancode,codesize,controversial,design
 
 # ------------------------------------------------------------------
 # Install

composer.json

@@ -5,10 +5,6 @@
     "keywords": ["pdf","dompdf", "zf2"],
     "license": "MIT",
     "authors": [
-        {
-          "name": "Zacharias Luiten",
-          "email": "[email protected]"
-        },
         {
           "name": "Raymond J. Kolbe",
           "email": "[email protected]"
@@ -20,9 +16,9 @@
     "require": {
         "php": ">=5.6",
         "zendframework/zend-loader": "^2.4",
-        "zendframework/zend-servicemanager": "^2.4",
+        "zendframework/zend-servicemanager": "^2.4 | ^3.0",
         "zendframework/zend-modulemanager": "^2.4",
-        "zendframework/zend-mvc": "^2.4",
+        "zendframework/zend-eventmanager": "^2.4 | ^3.0",
         "zendframework/zend-view": "^2.4",
         "zendframework/zend-serializer": "^2.4",
         "zendframework/zend-log": "^2.4",
@@ -33,10 +29,13 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.27",
+        "zendframework/zend-mvc": "^2.4 | ^3.0",
         "codeclimate/php-test-reporter": "^0.3.2",
         "fabpot/php-cs-fixer": "^1.12",
         "squizlabs/php_codesniffer": "^2.7",
-        "phpmd/phpmd": "^2.4"
+        "phpmd/phpmd": "^2.4",
+        "symfony/dependency-injection": "^3.0",
+        "symfony/config": "^3.0"
     },
     "autoload": {
         "psr-4": {