Merge branch '1.2.x'

Conflicts: CHANGELOG.markdown lib/PHPPdf/Version.php
jobcloud · Mar 6, 2016 · f204d9b · f204d9b
2 parents 75a120e + 8a2e507
commit f204d9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -6,8 +6,13 @@ CHANGELOG
   * [#47] support for max-height and max-width attributes
   * [#79] enhancements for page-size attribute support
 
-* 1.2.9 (???)
+* 1.2.10 (???)
 
+  * (nothing)
+
+* 1.2.9 (2016-03-06)
+
+  * [#95] relaxed ZF components versions
   * [#106] More relevant exception messages for colors, fonts and pdf files
 
 * 1.2.8 (2016-01-24)

diff --git a/composer.json b/composer.json
@@ -9,16 +9,15 @@
             "name":     "Piotr Śliwa",
             "homepage": "http://ohey.pl",
             "email":    "peter.pl7@gmail.com"
-        }     
+        }
     ],
     "require": {
-        "zendframework/zendpdf":  ">=2.0.0,<2.4",
-        "zendframework/zend-cache":  ">=2.0.0,<2.4",
-        "zendframework/zend-memory": ">=2.0.0,<2.4"
+        "zendframework/zendpdf":  "~2.0.0",
+        "zendframework/zend-cache":  "^2.0"
     },
     "require-dev": {
-        "zendframework/zend-barcode": ">=2.0.0,<2.4",
-        "zendframework/zend-validator": ">=2.0.0,<2.4",
+        "zendframework/zend-barcode": "^2.0",
+        "zendframework/zend-validator": "^2.0",
         "imagine/Imagine": ">=0.2.0,<0.6.0",
         "phpunit/phpunit": ">=4,<6.0.0"
     },
@@ -30,4 +29,4 @@
     "autoload": {
         "psr-0": { "PHPPdf": "lib/", "Imagine": "lib/" }
     }
-}
+}
diff --git a/examples/cli.php b/examples/cli.php
@@ -7,7 +7,7 @@
 set_time_limit(240);
 
 require_once __DIR__.'/get_examples.php';
-require_once __DIR__.'/../lib/PHPPdf/Autoloader.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 PHPPdf\Autoloader::register();
 PHPPdf\Autoloader::register(__DIR__.'/../lib/vendor/Zend/library');