Merge pull request #415 from imbo/beta2.0

2.0 beta
imbo · Dec 2, 2015 · c582139 · c582139
2 parents 483b70f + 67885d0
commit c582139
Show file tree

Hide file tree

Showing 316 changed files with 11,828 additions and 4,112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ composer.phar
 vendor
 docs/_build
 .lintcache
+*.log
+public/.htaccess
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
   - sudo add-apt-repository -y ppa:moti-p/cc
   - sudo apt-get update
   - sudo apt-get -y --reinstall install imagemagick
-  - printf "\n" | pecl install apcu-beta
+  - printf "\n" | pecl install apcu
   - printf "\n" | pecl install imagick-beta
 before_script:
   - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
@@ -30,3 +30,7 @@ before_script:
 script:
   - ./vendor/bin/phpunit --verbose -c tests/phpunit/phpunit.xml.travis
   - ./vendor/bin/behat --strict --profile no-cc --config tests/behat/behat.yml
+after_failure:
+  - echo "Tests failed - httpd log follows"
+  - echo "================================"
+  - cat build/logs/httpd.log
diff --git a/ChangeLog.markdown b/ChangeLog.markdown
@@ -1,6 +1,28 @@
 Changelog for Imbo
 ==================
 
+Imbo-2.0.0
+----------
+__yyyy-mm-dd__
+
+* #402: Fix Strip-transformation not doing anything on newer Imagick versions (Espen Hovlandsdal)
+* #402: Improve Contrast-transformation predictability (Espen Hovlandsdal)
+* #400: New image transformation: Blur (Kristoffer Brabrand)
+* #398: Add ability to configure HTTP cache headers (Espen Hovlandsdal)
+* #391: Make Crop-transformation validate coordinates (Espen Hovlandsdal)
+* #390: Fix image variation + crop transformation bug (Espen Hovlandsdal)
+* #386: Fix CORS wildcard-issue when client did not send `Origin`-header (Espen Hovlandsdal)
+* #381: New image transformation: DrawPois (points of interest) (Espen Hovlandsdal)
+* #376: Add config option to alter protocol used for authentication signatures (Espen Hovlandsdal)
+* #367: Fix bug where special characters could break metadata XML response (Kristoffer Brabrand)
+* #366: Fix border transformation + alpha channel bug (Espen Hovlandsdal)
+* #363: Add pluggable image identifier generation (Espen Hovlandsdal)
+* #357: Add public key generation CLI-command (Espen Hovlandsdal)
+* #351: New image transformation: SmartSize (Kristoffer Brabrand, Espen Hovlandsdal)
+* #348: Add global images endpoint (Kristoffer Brabrand)
+* #347: Use UUID instead of MD5 for image identifiers (Espen Hovlandsdal)
+* #328: New access control implementation (Espen Hovlandsdal, Kristoffer Brabrand)
+
 Imbo-1.2.5
 ----------
 __2015-08-14__

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011-2014, Christer Edvartsen <cogo@starzinger.net>
+Copyright (c) 2011-2015, Christer Edvartsen <cogo@starzinger.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/README.markdown b/README.markdown
@@ -7,7 +7,7 @@ Imbo is an image "server" that can be used to add/get/delete images using a REST
 End-user docs can be found [here](http://docs.imbo-project.org/en/latest/).
 
 ## License
-Copyright (c) 2011-2014, Christer Edvartsen <cogo@starzinger.net>
+Copyright (c) 2011-2015, Christer Edvartsen <cogo@starzinger.net>
 
 Licensed under the MIT License
 

diff --git a/bin/imbo b/bin/imbo
@@ -12,7 +12,7 @@
 chdir(dirname(__DIR__));
 
 $autoloaderFound = false;
-$paths = array('../../autoload.php', 'vendor/autoload.php');
+$paths = ['../../autoload.php', 'vendor/autoload.php'];
 
 // Include the autoloader generated by composer
 foreach ($paths as $path) {
@@ -24,7 +24,7 @@ foreach ($paths as $path) {
 }
 
 if (!$autoloaderFound) {
-    echo "Could not find autoload.php" . PHP_EOL;
+    echo 'Could not find autoload.php' . PHP_EOL;
     die(1);
 }
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
     "ext-imagick": ">=3.0.1",
     "symfony/http-foundation": "~2.7.3",
     "symfony/event-dispatcher": "~2.7.3",
-    "symfony/console": "~2.7.3"
+    "symfony/console": "~2.7.3",
+    "ramsey/uuid": "~3.0.0"
   },
   "require-dev": {
     "mikey179/vfsStream": "~1.5.0",