Migrate autoloading from psr-0 to psr-4

composer.json

@@ -26,10 +26,9 @@
     "suggest": {
         "behat/transliterator": "Transliterator provides ability to set non-latin1 pretty names"
     },
-    "target-dir": "Gregwar/Image",
     "autoload": {
-        "psr-0": {
-            "Gregwar\\Image": ""
+        "psr-4": {
+            "Gregwar\\Image\\": ""
         }
     },
     "scripts": {

demo/basic.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/cache.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/cacheCreate.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/cacheName.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/crop.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/data.php

@@ -1,14 +1,14 @@
 <?php
 
+require_once __DIR__.'/../vendor/autoload.php';
+
+use Gregwar\Image\Image;
+
 $data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'
     .'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'
     .'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'
     .'8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
 $data = base64_decode($data);
 
-require_once '../Image.php';
-
-use Gregwar\Image\Image;
-
 Image::fromData($data)
     ->save('out.jpg');

demo/fallback.php

@@ -1,11 +1,10 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
 echo Image::open('img/something-wrong.png')
     ->resize(100, 0)
     ->negate()
-    ->jpeg()
-    ;
+    ->jpeg();

demo/gc.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\GarbageCollect;
 

demo/get.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/guess.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/inline.php

@@ -1,5 +1,6 @@
 <?php
-require_once '../autoload.php';
+
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/merge.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/percent.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

demo/resource.php

@@ -1,14 +1,15 @@
 <?php
 
+require_once __DIR__.'/../vendor/autoload.php';
+
+use Gregwar\Image\Image;
+
 $data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'
     .'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'
     .'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'
     .'8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
 $data = base64_decode($data);
 
-require_once '../autoload.php';
-
-use Gregwar\Image\Image;
 
 $gd = imagecreatefromstring($data);
 

demo/watermark.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
@@ -10,7 +10,7 @@
 // Opening vinci.png
 $watermark = Image::open('img/vinci.png');
 
-// Mergine vinci text into mona in the top-right corner
+// Merging vinci text into mona in the top-right corner
 $img->merge($watermark, $img->width()-$watermark->width(),
     $img->height()-$watermark->height())
     ->save('out.jpg', 'jpg');

demo/write.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

doc/generate.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 

tests/bootstrap.php

@@ -5,5 +5,3 @@
     class_exists('\PHPUnit_Framework_TestCase')) {
     class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
 }
-
-require_once(__DIR__.'/../autoload.php');