Merge pull request #16 from BapCat/master.php71

Update to PHP 7.1

.gitignore

@@ -1,4 +1,3 @@
-.idea/
-report/
 vendor/
 composer.lock
+.idea/

.travis.yml

@@ -1,18 +1,17 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --prefer-source
-  - composer require satooshi/php-coveralls --prefer-source
 
 script:
   - mkdir -p build/logs
-  - ./test --coverage-clover build/logs/clover.xml
+  - phpunit --coverage-clover build/logs/clover.xml tests
 
-after_script:
-  - php vendor/bin/coveralls -v
+after_success:
+  - composer require php-coveralls/php-coveralls --prefer-source
+  - php vendor/bin/php-coveralls -v

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bapcat/phi",
   "description": "A super-minimal inversion-of-control library",
-  "license": "GPLv3",
+  "license": "GPL-3.0-or-later",
   "homepage": "http://github.com/BapCat/Phi",
   "keywords": ["IOC", "Inversion of control", "DI", "Dependency injection"],
   "authors": [
@@ -11,13 +11,13 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0",
-    "bapcat/interfaces": "^1.1",
-    "raphhh/trex-reflection": "^0.1.1"
+    "php": "^7.1",
+    "raphhh/trex-reflection": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.0",
-    "bapcat/values": "^0.1.4"
+    "roave/security-advisories": "dev-master",
+    "phpunit/phpunit": "^7.5",
+    "bapcat/values": "^0.2"
   },
   "autoload": {
     "psr-4": {

phpunit.xml

@@ -4,9 +4,10 @@
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
       <directory suffix=".php">src</directory>
+
+      <exclude>
+        <directory suffix=".php">vendor</directory>
+      </exclude>
     </whitelist>
-    <exclude>
-      <directory suffix=".php">vendor</directory>
-    </exclude>
   </filter>
 </phpunit>

src/Ioc.php

@@ -0,0 +1,93 @@
+<?php declare(strict_types=1); namespace BapCat\Phi;
+
+/**
+ * Dependency injection manager
+ *
+ * @author    Corey Frenette
+ * @copyright Copyright (c) 2019, BapCat
+ */
+abstract class Ioc implements Resolver {
+  /** @var  Ioc|null  $instance  Singleton instance */
+  private static $instance;
+
+  /**
+   * Accessor for singleton
+   *
+   * @return  Ioc
+   */
+  public static function instance(): Ioc {
+    if(self::$instance === null) {
+      self::$instance = new static();
+    }
+
+    return self::$instance;
+  }
+
+  /**
+   * @note  This function automatically binds Ioc to itself
+   */
+  private function __construct() {
+    $this->bind(__CLASS__, $this);
+  }
+
+  /**
+   * Binds a class to an alias
+   *
+   * @param  string                  $alias    An alias (eg. `db.helper`), or a real class or
+   *                                           interface name to be replaced by `$binding`
+   * @param  string|callable|object  $binding  May be one of the following:
+   *                                           <ul>
+   *                                             <li>The fully-qualified name of a class</li>
+   *                                             <li>An instance of a class (creates a singleton)</li>
+   *                                             <li>A callable that returns an instance of a class</li>
+   *                                           </ul>
+   *
+   * @return  void
+   */
+  public abstract function bind(string $alias, $binding): void;
+
+  /**
+   * Binds a class to an alias as a lazy-loaded singleton
+   *
+   * @param  string                  $alias    An alias (eg. `db.helper`), or a real class or
+   *                                           interface name to be replaced by `$binding`
+   * @param  string|callable|object  $binding  May be one of the following:
+   *                                           <ul>
+   *                                             <li>The fully-qualified name of a class</li>
+   *                                             <li>An instance of a class (creates a singleton)</li>
+   *                                             <li>A callable that returns an instance of a class</li>
+   *                                           </ul>
+   * @param  array  $arguments  The arguments to pass to the binding when it is constructed
+   *
+   * @return  void
+   */
+  public abstract function singleton(string $alias, $binding, array $arguments = []): void;
+
+  /**
+   * Resolves an alias to a concrete class name
+   *
+   * @param  string  $alias  An alias (eg. `db.helper`) to resolve back to a real class
+   *
+   * @return  string|callable|object  The concrete class registered to alias, or `$alias` if there is no binding
+   */
+  public abstract function resolve(string $alias);
+
+  /**
+   * Adds a custom resolver to the IoC container
+   *
+   * @param  Resolver  $resolver  The resolver to add
+   *
+   * @return  void
+   */
+  public abstract function addResolver(Resolver $resolver): void;
+
+  /**
+   * Executes a callable using dependency injection
+   *
+   * @param  callable  $call       A callable to execute using dependency injection
+   * @param  mixed[]   $arguments  The arguments to pass to the callable
+   *
+   * @return  mixed  The return value of the callable
+   */
+  public abstract function call(callable $call, array $arguments = []);
+}