Merge pull request #162 from koriym/php7.0

Support PHP 7.0

.php_cs

@@ -125,5 +125,6 @@ return \PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('tests/Fake')
-            ->in('src')
+            ->exclude('tests/tmp')
+            ->in(__DIR__)
     )->setLineEnding("\n");

.travis.yml

@@ -2,10 +2,9 @@ language: php
 sudo: required
 dist: trusty
 php:
-  - 5.6
-  - 7
+  - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 cache:
   directories:
     - vendor
@@ -19,7 +18,7 @@ before_script:
   - composer update $DEPENDENCIES
 script:
   - ./vendor/bin/phpunit --coverage-clover=coverage.clover;
-  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php php-cs-fixer-v2.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar && php php-cs-fixer.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
 
 after_script:
   - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

README.ja.md

@@ -572,28 +572,22 @@ $lister = $injector->getInstance(ListerInterface::class);
 
 `Ray.Di` のためのさまざまなモジュールが利用可能です。 https://github.com/Ray-Di
 
-## 要件
-
-* PHP 5.6+
-* hhvm
-
-
 ## インストール
 
 Ray.Diをインストールにするには [Composer](http://getcomposer.org)を利用します。
 
 ```bash
 # Add Ray.Di as a dependency
-$ composer require ray/di ~2.0@dev
+$ composer require ray/di ^2.0
 ```
 
 ## テスト
 
 インストールしてテストとデモプログラムを実行します。
 
 ```bash
-$ composer create-project ray/di Ray.Di ~2.0@dev
+$ git clone https://github.com/ray-di/Ray.Di.git
 $ cd Ray.Di
-$ phpunit
+$ ./vendor/bin/phpunit
 $ php docs/demo/run.php
-```
+```

README.md

@@ -861,27 +861,22 @@ $lister = $injector->getInstance(ListerInterface::class);
 
 Various modules for `Ray.Di` are available at https://github.com/Ray-Di.
 
-## Requirements ##
-
-* PHP 5.6+
-* hhvm
-
 ## Installation ##
 
 The recommended way to install Ray.Di is through [Composer](https://github.com/composer/composer).
 
 ```bash
 # Add Ray.Di as a dependency
-$ composer require ray/di ~2.0
+$ composer require ray/di ^2.0
 ```
 
 ## Testing Ray.Di ##
 
 Here's how to install Ray.Di from source and run the unit tests and demos.
 
 ```bash
-$ composer create-project ray/di:~2.0 Ray.Di
+$ git clone https://github.com/ray-di/Ray.Di.git
 $ cd Ray.Di
-$ phpunit
+$ ./vendor/bin/phpunit
 $ php docs/demo/run.php
 ```

composer.json

@@ -16,14 +16,12 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
-        "ray/aop": "^2.4.1",
+        "php": ">=7.0.0",
+        "ray/aop": "^2.5",
         "ray/compiler": "^1.1.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^2.8",
-        "phpmd/phpmd": "^2.6"
+        "phpunit/phpunit": "^6.3.0"
     },
     "autoload": {
         "psr-4": {

docs/demo/01-linked-binding-setter-injection.php

@@ -4,7 +4,7 @@
 use Ray\Di\Di\Inject;
 use Ray\Di\Injector;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 interface FinderInterface
 {

docs/demo/01-linked-binding.php

@@ -3,7 +3,7 @@
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 interface FinderInterface
 {

docs/demo/02-provider-binding.php

@@ -36,9 +36,6 @@ class ModernMovieLister implements MovieListerInterface
 {
     public $finder;
 
-    /**
-     *
-     */
     public function __construct(FinderInterface $finder)
     {
         $this->finder = $finder;
@@ -55,7 +52,7 @@ public function __construct(InjectionPointInterface $ip)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     public function get()
     {

docs/demo/02b-named-by-named.php

@@ -2,7 +2,6 @@
 
 use Ray\Di\AbstractModule;
 use Ray\Di\Di\Named;
-use Ray\Di\Di\Qualifier;
 use Ray\Di\Injector;
 
 require __DIR__ . '/bootstrap.php';

docs/demo/03-injection-point.php

@@ -5,7 +5,7 @@
 use Ray\Di\Injector;
 use Ray\Di\ProviderInterface;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 interface FinderInterface
 {
@@ -79,4 +79,4 @@ protected function configure()
 $result = $movieLister->finder->find();
 $works = ($result === 'search for [MovieLister]');
 
-echo($works ? 'It works!' : 'It DOES NOT work!').PHP_EOL;
+echo($works ? 'It works!' : 'It DOES NOT work!') . PHP_EOL;

docs/demo/04-untarget-binding.php

@@ -4,7 +4,7 @@
 use Ray\Di\Injector;
 use Ray\Di\Scope;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 class Finder
 {

docs/demo/05b-constructor-binding-setter-injection.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Ray\Di\Demo;
 
 use Ray\Di\AbstractModule;

docs/demo/06-install.php

@@ -3,7 +3,7 @@
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 interface FinderInterface
 {

docs/demo/07-assisted-injection.php

@@ -4,7 +4,7 @@
 use Ray\Di\Di\Assisted;
 use Ray\Di\Injector;
 
-require __DIR__.'/bootstrap.php';
+require __DIR__ . '/bootstrap.php';
 
 interface FinderInterface
 {

docs/demo/12-dependency-chain-error-message.php

@@ -58,20 +58,20 @@ protected function configure()
     $injector->getInstance(A::class);
 } catch (Unbound $e) {
     echo $e->getMessage();
-//    dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
+    //    dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
     echo PHP_EOL . '---------' . PHP_EOL;
     echo $e;
-//    exception 'Ray\Di\Exception\Unbound' with message 'EInterface-'
-//    - dependency 'EInterface' with name '' used in12-dependency-chain-error-message.php:26
-//    - dependency 'D' with name '' used in12-dependency-chain-error-message.php:21
-//    - dependency 'C' with name '' used in12-dependency-chain-error-message.php:16
-//    - dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
-// ...
+    //    exception 'Ray\Di\Exception\Unbound' with message 'EInterface-'
+    //    - dependency 'EInterface' with name '' used in12-dependency-chain-error-message.php:26
+    //    - dependency 'D' with name '' used in12-dependency-chain-error-message.php:21
+    //    - dependency 'C' with name '' used in12-dependency-chain-error-message.php:16
+    //    - dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
+    // ...
     echo PHP_EOL . '---------' . PHP_EOL;
     do {
         echo get_class($e) . ':' . $e->getMessage() . PHP_EOL;
     } while ($e = $e->getPrevious());
-//    Ray\Di\Exception\Unbound:dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
+    //    Ray\Di\Exception\Unbound:dependency 'B' with name '' used in12-dependency-chain-error-message.php:11
 //    Ray\Di\Exception\Unbound:dependency 'C' with name '' used in12-dependency-chain-error-message.php:16
 //    Ray\Di\Exception\Unbound:dependency 'D' with name '' used in12-dependency-chain-error-message.php:21
 //    Ray\Di\Exception\Unbound:dependency 'EInterface' with name '' used in12-dependency-chain-error-message.php:26

docs/demo/finder_module.php

@@ -36,12 +36,16 @@ class DbFinder implements FinderInterface
     public function __construct(DbInterface $db)
     {
     }
-/** @Inject */public function setDb(DbInterface $db)
-{
-}
-/** @Inject */public function setSorter(Sorter $sorter, Sorter $sorte2)
-{
-}
+
+    /** @Inject */
+    public function setDb(DbInterface $db)
+    {
+    }
+
+    /** @Inject */
+    public function setSorter(Sorter $sorter, Sorter $sorte2)
+    {
+    }
 }
 
 interface MovieListerInterface
@@ -53,9 +57,11 @@ class MovieLister implements MovieListerInterface
     public function __construct(FinderInterface $finder)
     {
     }
-/** @Inject */public function setFinder01(FinderInterface $finder, FinderInterface $finder1, FinderInterface $finder2)
-{
-}
+
+    /** @Inject */
+    public function setFinder01(FinderInterface $finder, FinderInterface $finder1, FinderInterface $finder2)
+    {
+    }
 }
 
 class FinderModule extends AbstractModule

src/AbstractModule.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * This file is part of the Ray.Di package.
  *
@@ -40,8 +42,6 @@ public function __construct(
 
     /**
      * Install module
-     *
-     * @param AbstractModule $module
      */
     public function install(AbstractModule $module)
     {
@@ -50,8 +50,6 @@ public function install(AbstractModule $module)
 
     /**
      * Override module
-     *
-     * @param AbstractModule $module
      */
     public function override(AbstractModule $module)
     {
@@ -64,7 +62,7 @@ public function override(AbstractModule $module)
      *
      * @return Container
      */
-    public function getContainer()
+    public function getContainer() : Container
     {
         if (! $this->container) {
             $this->activate();
@@ -113,7 +111,7 @@ public function bindPriorityInterceptor(AbstractMatcher $classMatcher, AbstractM
      * @param string $sourceName      Original binding name
      * @param string $targetInterface Original interface
      */
-    public function rename($interface, $newName, $sourceName = Name::ANY, $targetInterface = '')
+    public function rename(string $interface, string $newName, string $sourceName = Name::ANY, string $targetInterface = '')
     {
         $targetInterface = $targetInterface ?: $interface;
         $this->lastModule->getContainer()->move($interface, $sourceName, $targetInterface, $newName);
@@ -126,18 +124,17 @@ abstract protected function configure();
 
     /**
      * Bind interface
-     *
-     * @param string $interface
-     *
-     * @return Bind
      */
-    protected function bind($interface = '')
+    protected function bind(string $interface = '') : Bind
     {
         $bind = new Bind($this->getContainer(), $interface);
 
         return $bind;
     }
 
+    /**
+     * Activate bindings
+     */
     private function activate()
     {
         $this->container = new Container;

src/AnnotatedClass.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the Ray.Di package.
  *
@@ -7,7 +8,6 @@
 namespace Ray\Di;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Ray\Di\Di\PostConstruct;
 
 final class AnnotatedClass
@@ -24,7 +24,6 @@ final class AnnotatedClass
 
     public function __construct(AnnotationReader $reader)
     {
-        AnnotationRegistry::registerFile(__DIR__ . '/DoctrineAnnotations.php');
         $this->reader = $reader;
         $this->injectionMethod = new AnnotatedClassMethods($reader);
     }
@@ -64,7 +63,7 @@ public function getPostConstruct(\ReflectionClass $class)
         $methods = $class->getMethods();
         foreach ($methods as $method) {
             /* @var $annotation PostConstruct|null */
-            $annotation = $this->reader->getMethodAnnotation($method, 'Ray\Di\Di\PostConstruct');
+            $annotation = $this->reader->getMethodAnnotation($method, PostConstruct::class);
             if ($annotation instanceof PostConstruct) {
                 return $method;
             }