Merge branch 'hotfix/0.1.3'

contao · Feb 14, 2017 · 8e5515c · 8e5515c
2 parents 3dd0039 + 24d29ab
commit 8e5515c
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 55 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{php,twig,yml}]
+indent_style = space
+indent_size = 4
+
+[*.min.{css,js}]
+insert_final_newline = false
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
-# Vendor
+# Composer
+/composer.lock
 /vendor/
+
+# PhpUnit
+/phpunit.xml
diff --git a/.php_cs b/.php_cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,28 @@
+<?php
+
+$date = date('Y');
+
+$header = <<<EOF
+This file is part of Contao.
+
+Copyright (c) 2005-$date Leo Feyer
+
+@license LGPL-3.0+
+EOF;
+
+$finder = PhpCsFixer\Finder::create()
+    ->in([__DIR__.'/src', __DIR__.'/tests'])
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'psr0' => false,
+        'array_syntax' => ['syntax' => 'short'],
+        'header_comment' => ['header' => $header],
+        'strict_comparison' => true,
+    ])
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setUsingCache(false)
+;
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -80,12 +80,12 @@ checks:
             interface_name: '^[A-Z][a-zA-Z0-9]*Interface$'
             type_name: '^[A-Z][a-zA-Z0-9]*$'
             exception_name: '^[A-Z][a-zA-Z0-9]*Exception$'
-            isser_method_name: '^(?:is|can|has|grants|should|may|supports)'
+            isser_method_name: '^(?:is|can|has|grants|should|may|requires|supports)'
         more_specific_types_in_doc_comments: true
         missing_arguments: true
         method_calls_on_non_object: true
         line_length:
-            max_length: '120'
+            max_length: '0'
         instanceof_class_exists: true
         function_in_camel_caps: true
         foreach_usable_as_reference: true

diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ sudo: false
 env:
   global:
     - COMPOSER_ALLOW_XDEBUG=0
-    - SYMFONY_DEPRECATIONS_HELPER=weak
 
 matrix:
   include:
@@ -27,7 +26,7 @@ matrix:
     - php: 7.1
 
 before_install:
-  - composer selfupdate --snapshot # TODO: remove when Composer 1.3 stable is released
+  - composer selfupdate
 
 before_script:
   - travis_wait composer update $COMPOSER_FLAGS --no-interaction

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,14 +3,16 @@ shallow_clone: true
 platform: x86
 clone_folder: c:\projects\contao-imagine-svg
 
+cache:
+  - '%LOCALAPPDATA%\Composer\files'
+
 init:
   - SET PATH=c:\php;%PATH%
-  - SET SYMFONY_DEPRECATIONS_HELPER=weak
 
 install:
   - mkdir c:\php && cd c:\php
-  - appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.6.25-Win32-VC11-x86.zip
-  - 7z x php-5.6.25-Win32-VC11-x86.zip -y >nul
+  - appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.6.27-Win32-VC11-x86.zip
+  - 7z x php-5.6.27-Win32-VC11-x86.zip -y >nul
   - del *.zip
   - copy php.ini-production php.ini
   - echo date.timezone="UTC" >> php.ini

diff --git a/composer.json b/composer.json
@@ -15,10 +15,10 @@
         "imagine/imagine": "^0.6"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~1.8",
-        "phpunit/phpunit": "~4.5",
-        "symfony/filesystem": "~2.8 | ~3.0",
-        "satooshi/php-coveralls": "~0.6"
+        "friendsofphp/php-cs-fixer": "^2.0",
+        "phpunit/phpunit": "^4.5",
+        "satooshi/php-coveralls": "^0.6",
+        "symfony/filesystem": "^2.8|^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +27,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Contao\\ImagineSvg\\Test\\": "tests/"
+            "Contao\\ImagineSvg\\Tests\\": "tests/"
         }
     },
     "extra": {

diff --git a/src/Image.php b/src/Image.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/src/Imagine.php b/src/Imagine.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/src/RelativeBox.php b/src/RelativeBox.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/src/RelativeBoxInterface.php b/src/RelativeBoxInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/src/UndefinedBox.php b/src/UndefinedBox.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/src/UndefinedBoxInterface.php b/src/UndefinedBoxInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */

diff --git a/tests/ImageTest.php b/tests/ImageTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */
 
-namespace Contao\ImagineSvg\Test;
+namespace Contao\ImagineSvg\Tests;
 
 use Contao\ImagineSvg\Image;
 use Contao\ImagineSvg\Imagine;

diff --git a/tests/ImagineTest.php b/tests/ImagineTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */
 
-namespace Contao\ImagineSvg\Test;
+namespace Contao\ImagineSvg\Tests;
 
 use Contao\ImagineSvg\Imagine;
 use Contao\ImagineSvg\UndefinedBox;

diff --git a/tests/RelativeBoxTest.php b/tests/RelativeBoxTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */
 
-namespace Contao\ImagineSvg\Test;
+namespace Contao\ImagineSvg\Tests;
 
 use Contao\ImagineSvg\RelativeBox;
 use Imagine\Image\Point;

diff --git a/tests/UndefinedBoxTest.php b/tests/UndefinedBoxTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */
 
-namespace Contao\ImagineSvg\Test;
+namespace Contao\ImagineSvg\Tests;
 
 use Contao\ImagineSvg\UndefinedBox;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2016 Leo Feyer
+ * Copyright (c) 2005-2017 Leo Feyer
  *
  * @license LGPL-3.0+
  */