Merge branch 'master' into php7

Author: Rastusik

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 composer.phar
 vendor/*
 .idea/*
+data/php-di

README.md

@@ -16,7 +16,7 @@ Require the libraries with Composer:
 {
     "require": {
         "php-di/php-di": "*",
-        "php-di/zf-bridge": "*"
+        "php-di/zend-framework-bridge": "*"
     }
 }
 ```
@@ -26,15 +26,16 @@ To use PHP-DI in your Zend Framework application, you need to edit `application_
 ```php
     // ...
     'modules' => [
-        ...
         'DI\ZendFramework',
+        'Zend\Router',
+        'Zend\Mvc\Console',
         ...
     ],
 
     'service_manager' => [
         // ...
         'factories' => [
-            'DI\Container' => 'DI\ZendFramework\Service\DIContainerFactory',
+            'DI\Container' => DI\ZendFramewor\Service\DIContainerFactory::class,
         ],
     ],
 ```
@@ -146,3 +147,13 @@ To clear the definition cache, run the following command from the project root:
 ```
 php public/index.php php-di-clear-cache
 ```
+
+## Run sample application
+
+Run `composer install --dev`
+
+After that, open terminal and go to the `quickstart` folder and run `php -S 0.0.0.0:8080 -t public public/index.php`
+
+Open a browser and go to this address: `http://localhost:8080/hello`
+
+You should see a page with a greeting coming from the GreetingController, which is being resolved by the PHP-DI configuration.

composer.json

@@ -6,17 +6,24 @@
     "license": "MIT",
     "require": {
         "php": ">=7.0",
-        "php-di/php-di": "~5.0",
-        "acclimate/container": "~1.0",
-        "doctrine/annotations": "~1.0",
-        "doctrine/cache": "~1.0"
+        "php-di/php-di": "^5.0",
+        "acclimate/container": "^1.0",
+        "doctrine/annotations": "^1.0",
+        "doctrine/cache": "^1.0",
+        "roave/security-advisories": "dev-master"
     },
 
     "require-dev": {
-        "zendframework/zendframework": "~2.5",
-        "squizlabs/php_codesniffer": "~2.0",
-        "phpmd/phpmd" : "~2.0",
-        "phpunit/phpunit": "~4.8"
+        "zendframework/zendframework": "^3.0",
+        "squizlabs/php_codesniffer": "^2.6",
+        "phpmd/phpmd" : "^2.5",
+        "phpunit/phpunit": "^5.0",
+        "phpro/grumphp": "^0.11.2",
+        "nikic/php-parser": "^3.0",
+        "sebastian/phpcpd": "^3.0",
+        "friendsofphp/php-cs-fixer": "^2.1",
+        "jakub-onderka/php-parallel-lint": "^0.9.2",
+        "sensiolabs/security-checker": "^4.0"
     },
 
     "autoload": {
@@ -27,7 +34,8 @@
 
     "autoload-dev": {
       "psr-4": {
-        "Test\\DI\\ZendFramework\\": "tests/"
+        "Test\\DI\\ZendFramework\\": "tests/DI/ZendFramework",
+        "Application\\": "quickstart/module/Application/src"
       }
     }
 }

config/module.config.php

@@ -8,30 +8,21 @@
  */
 namespace DI\ZendFramework;
 
-// compatibility with zend > 2.5
-$controllerType = 'ControllerLoader';
-if (class_exists('\Zend\Version\Version')) {
-    $version = new \Zend\Version\Version();
-    if ($version::compareVersion('2.5.0') <= 0) {
-        $controllerType = 'ControllerManager';
-    }
-}
-
 return [
     'controllers' => [
-        'invokables' => [
-            'DI\\ZendFramework\\Controller\\Console' => 'DI\\ZendFramework\\Controller\\ConsoleController',
-        ],
+        'factories' => [
+            Controller\ConsoleController::class => Service\ConsoleControllerFactory::class,
+        ]
     ],
 
     'service_manager' => [
-        'abstract_factories' => array(
-            __NAMESPACE__ . '\\Service\\PHPDIAbstractFactory' => __NAMESPACE__ . '\\Service\\PHPDIAbstractFactory',
-        ),
+        'abstract_factories' => [
+            Service\PHPDIAbstractFactory::class => Service\PHPDIAbstractFactory::class,
+        ],
 
         'factories' => [
-            $controllerType => __NAMESPACE__ . '\\Service\\ControllerLoaderFactory',
-            'DiCache' => __NAMESPACE__ . '\\Service\\CacheFactory',
+            'ControllerManager' => Service\ControllerManagerFactory::class,
+            'DiCache' => Service\CacheFactory\CacheFactory::class,
         ],
     ],
 
@@ -42,7 +33,7 @@
                     'options' => [
                         'route'    => 'php-di-clear-cache',
                         'defaults' => [
-                            'controller' => __NAMESPACE__ . '\Controller\Console',
+                            'controller' => Controller\ConsoleController::class,
                             'action'     => 'clearCache',
                             '__NAMESPACE__' => __NAMESPACE__,
                         ]

grumphp.yml

@@ -0,0 +1,35 @@
+parameters:
+    git_dir: .
+    bin_dir: vendor/bin
+    tasks:
+      phpcpd: ~
+      phpcs:
+        standard: PSR2
+        show_warnings: true
+        tab_width: 4
+        whitelist_patterns: []
+        encoding: ~
+        ignore_patterns: []
+        sniffs: []
+        triggered_by: [php]
+      phpcsfixer2:
+        allow_risky: false
+        cache_file: ~
+        config: ~
+        rules:
+          - '@@PSR2'
+        using_cache: true
+        path_mode: ~
+        verbose: false
+        diff: true
+        triggered_by: ['php']
+      phplint: ~
+      phpmd:
+        exclude: []
+        ruleset: ['unusedcode', 'design', 'controversial', 'naming', 'codesize', 'cleancode']
+        triggered_by: ['php']
+      phpparser: ~
+      phpunit: ~
+      phpversion: ~
+      securitychecker: ~
+      shell: ~

quickstart/.gitignore

@@ -0,0 +1,6 @@
+.vagrant/
+vendor/
+config/development.config.php
+data/cache/*
+!data/cache/.gitkeep
+phpunit.xml

quickstart/CONDUCT.md

@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.