Symfony 4 compat

.gitignore

@@ -1,4 +1,5 @@
 *.iml
 .idea
 vendor/
-composer.lock
+composer.lock
+/.php_cs.cache

.php_cs

@@ -0,0 +1,27 @@
+<?php
+
+$config = PhpCsFixer\Config::create();
+$config->setRiskyAllowed(true);
+$config->setRules([
+    '@PSR2' => true,
+    '@Symfony' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'ordered_imports' => true,
+    'php_unit_construct' => true,
+    'php_unit_dedicate_assert' => true,
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_trim' => true,
+    'psr4' => true,
+]);
+
+$finder = PhpCsFixer\Finder::create();
+$finder->in([
+    'src',
+    'tests',
+]);
+
+$config->setFinder($finder);
+
+return $config;

.travis.yml

@@ -1,55 +1,40 @@
 language: php
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.3
+  - 7.2
   - 7.1
 
+env:
+  - COMPOSER_MEMORY_LIMIT=-1
 
 before_install:
   - composer self-update
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-  - composer require --no-update symfony/framework-bundle "$SYMFONY_VERSION"
 
 install:
-  - composer install --prefer-source
-
-script: vendor/bin/phpunit --configuration Tests/phpunit.xml
+  - composer install --prefer-dist --no-interaction
 
-env:
-  - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.7.*
-  - SYMFONY_VERSION=2.8.*
+script: vendor/bin/phpunit
 
-matrix:
+jobs:
   include:
-    - php: 5.5
-      env: SYMFONY_VERSION=3.0.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.1
-      env: SYMFONY_VERSION=3.0.*
-
-    - php: 7.0
-      env: SYMFONY_VERSION=3.1.*
-    - php: 7.1
-      env: SYMFONY_VERSION=3.1.*
-
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.*
-    - php: 7.1
-      env: SYMFONY_VERSION=3.2.*
-
-    - php: 7.1
-      env: SYMFONY_VERSION=3.3.*
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
+    - stage: Test
+      php: 7.1
+      name: prefer-lowest
+      env:
+        - SYMFONY_DEPRECATIONS_HELPER=disabled
+      install:
+        - composer remove --dev friendsofphp/php-cs-fixer --no-update
+        - composer update --no-interaction --prefer-dist --prefer-stable --prefer-lowest
+    - stage: Additional checks
+      name: Test coverage
+      script: phpdbg -qrr vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml --coverage-text
+      after_success:
+        - php vendor/bin/php-coveralls -v
+    - name: Code style
+      script: vendor/bin/php-cs-fixer fix --verbose --dry-run

README.markdown → README.md

@@ -1,30 +1,35 @@
 PsPdfBundle
 ===========
 
-[![Build Status](https://secure.travis-ci.org/psliwa/PdfBundle.png?branch=master)](http://travis-ci.org/psliwa/PdfBundle)
+[![Build Status](https://travis-ci.org/facile-it/PdfBundle.svg?branch=symfony4)](https://travis-ci.org/facile-it/PdfBundle)
+[![Coverage Status](https://coveralls.io/repos/github/facile-it/PdfBundle/badge.svg?branch=symfony4)](https://coveralls.io/github/facile-it/PdfBundle?branch=symfony4)
 
-This bundle integrates Symfony2 with [PHPPdf][1] library. Thanks to this bundle you can easily generate PDF or image (png, jpg) files.
+This bundle is a fork of [psliwa/PdfBundle](https://github.com/psliwa/PdfBundle); this branch (`symfony4`) aims at updating all the dependencies of this bundle to make it work with Symfony 4 and Symfony Flex. To check on what has been done, look at [the relative milestone](https://github.com/facile-it/PdfBundle/milestone/1).
+
+This bundle integrates Symfony (3.4/4.x) with [PHPPdf][1] library. Thanks to this bundle you can easily generate PDF or image (png, jpg) files.
 
 Documentation of [PHPPdf][1] you can find on github (README file).
 
 Installation
 ------------
-
-  1. Use composer. PsPdfBundle requires "minimum-stability" equals to dev. Run this command:
-
-        composer require psliwa/pdf-bundle
-
-  2. Register bundle in AppKernel:
-
-          //app/AppKernel.php
-          public function registerBundles()
-          {
-              return array(
-                  // ..
-                  new Ps\PdfBundle\PsPdfBundle(),
-                  // ..
-              );
-          }
+1. Use composer
+```bash
+composer require psliwa/pdf-bundle
+```
+
+2. Register bundle in AppKernel:
+
+```php
+//app/AppKernel.php
+public function registerBundles()
+{
+    return [
+        // ..
+        new Ps\PdfBundle\PsPdfBundle(),
+        // ..
+    ];
+}
+```
 
 Configuration
 -------------

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "psliwa/pdf-bundle",
-    "description": "This bundle integrates Symfony2 with PHPPdf library.",
+    "description": "This bundle integrates Symfony 3.4/4 with PHPPdf library.",
     "keywords": ["PDF", "PHPPdf"],
     "type": "symfony-bundle",
     "license": "MIT",
@@ -11,17 +11,34 @@
             "email":    "[email protected]"
         }     
     ],
+    "config": {
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "require": {
-        "php": ">=5.3.0",
-        "symfony/symfony": "~2.3|~3.0",
+        "php": "^7.1",
+        "doctrine/annotations": "^1.0",
         "psliwa/php-pdf": "^1.1.5",
-        "sensio/framework-extra-bundle": ">=2.0 <4.0.0"
+        "sensio/framework-extra-bundle": "^2|^3|^4|^5",
+        "symfony/config": "^3.4|^4.0",
+        "symfony/dependency-injection": "^3.4|^4.0",
+        "symfony/event-dispatcher": "^3.4|^4.0",
+        "symfony/framework-bundle": "^3.4|^4.0",
+        "symfony/http-foundation": "^3.4|^4.0",
+        "symfony/http-kernel": "^3.4|^4.0",
+        "symfony/templating": "^3.4|^4.0",
+        "twig/twig": "^1.0|^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4,<6.0.0"
+        "friendsofphp/php-cs-fixer": "^2.15",
+        "php-coveralls/php-coveralls": "^2.1",
+        "phpunit/phpunit": "^7.5.11|^8.0",
+        "symfony/phpunit-bridge": "^4.2"
     },
     "autoload": {
-        "psr-0": { "Ps\\PdfBundle": "" }
+        "psr-4": { "Ps\\PdfBundle\\": "src" }
     },
-    "target-dir": "Ps/PdfBundle"
+    "autoload-dev": {
+        "psr-4": { "Ps\\PdfBundle\\Tests\\": "tests" }
+    }
 }

phpunit.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.5/phpunit.xsd"
+        colors="true"
+        beStrictAboutChangesToGlobalState="true"
+        beStrictAboutOutputDuringTests="true"
+        cacheResult="false"
+        bootstrap="vendor/autoload.php">
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+
+    <testsuites>
+        <testsuite name="PdfBundle">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

Annotation/Pdf.php → src/Annotation/Pdf.php

@@ -11,32 +11,29 @@
 use Doctrine\Common\Annotations\Annotation;
 
 /**
- * Pdf annotation
- * 
+ * Pdf annotation.
+ *
  * @Annotation
+ *
  * @author Piotr Śliwa <[email protected]>
  */
 class Pdf
 {
     public $stylesheet;
     public $documentParserType = 'xml';
-    public $headers = array();
+    public $headers = [];
     public $enableCache = false;
 
     public function __construct(array $values)
     {
         $currentValues = get_object_vars($this);
-
-        foreach($values as $key => $value)
-        {
-            if(array_key_exists($key, $currentValues))
-            {
+
+        foreach ($values as $key => $value) {
+            if (array_key_exists($key, $currentValues)) {
                 $this->$key = $value;
-            }
-            else
-            {
+            } else {
                 throw new \InvalidArgumentException(sprintf('Argument "%s" for @Pdf() annotation is unsupported.', $key));
             }
         }
     }
-}
+}