Merge pull request #3 from sandrokeil/hotfix/autoload-path

fixed include paths

Author: Alexander Miertsch

CHANGELOG.md

@@ -0,0 +1,22 @@
+# prooph Command Line Interface CHANGELOG
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 0.1.1 (2016-01-20)
+
+### Added
+
+* Nothing
+
+### Deprecated
+
+* Nothing
+
+### Removed
+
+* Nothing
+
+### Fixed
+
+* Fixed include paths
+* Fixed directory separator for class path

README.md

@@ -1,7 +1,7 @@
 # prooph Command Line Interface
 
 ## Overview
-The prooph command line interfaces generates classes to increase development speed. For available commands run
+The prooph command line interface generates classes to increase development speed. For available commands run
 
 ```bash
 $ php bin/prooph-cli list

bin/prooph-cli

@@ -23,6 +23,7 @@ if (!ini_get('date.timezone')) {
 
 foreach (
     array(
+        __DIR__ . '/../../../autoload.php',
         __DIR__ . '/../../autoload.php',
         __DIR__ . '/../vendor/autoload.php',
         __DIR__ . '/vendor/autoload.php'
@@ -76,8 +77,3 @@ $application->add($container->get(Command\GenerateEvent::class));
 $application->add($container->get(Command\GenerateAggregate::class));
 
 $application->run();
-
-
-
-
-

config/services.php

@@ -10,4 +10,4 @@
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
 
-return new ServiceManager(new Config(require 'config/dependencies.php'));
+return new ServiceManager(new Config(require __DIR__ . '/dependencies.php'));

src/Console/Command/GenerateAll.php

@@ -81,16 +81,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             'event' =>  $input->getArgument('event-name'),
         ];
 
-//        if ($path = rtrim($input->getArgument('path'), '/')) {
-//            $path .= '/';
-//        }
         $path = $input->getArgument('path');
 
         $aggregatePath = '';
 
         foreach ($commands as $commandName => $name) {
             $command = $this->getApplication()->find('prooph:generate:' . $commandName);
-//            $commandPath = $path . $command->getDefinition()->getArgument('path')->getDefault();
 
             $arguments = [
                 'name'    => $name,

src/Console/Helper/Psr4Info.php

@@ -110,7 +110,7 @@ public function getFilename($path, $name)
     {
         $filename = $this->getSourceFolder() . DIRECTORY_SEPARATOR;
 
-        if ($path = rtrim($path, '/')) {
+        if ($path = trim($path, '/')) {
             $filename .= $path . DIRECTORY_SEPARATOR;
         }
 
@@ -140,8 +140,12 @@ private function filterDirectoryToNamespace()
     {
         if (null === $this->filterDirectoryToNamespace) {
             $this->filterDirectoryToNamespace = new FilterChain();
-            $this->filterDirectoryToNamespace->attachByName('wordseparatortocamelcase', ['separator' => DIRECTORY_SEPARATOR]);
-            $this->filterDirectoryToNamespace->attachByName('wordcamelcasetoseparator', ['separator' => '\\\\']);
+            $this->filterDirectoryToNamespace->attachByName(
+                'wordseparatortocamelcase', ['separator' => DIRECTORY_SEPARATOR]
+            );
+            $this->filterDirectoryToNamespace->attachByName(
+                'wordcamelcasetoseparator', ['separator' => '\\\\']
+            );
         }
         return $this->filterDirectoryToNamespace;
     }
@@ -153,8 +157,12 @@ private function filterNamespaceToDirectory()
     {
         if (null === $this->filterNamespaceToDirectory) {
             $this->filterNamespaceToDirectory = new FilterChain();
-            $this->filterNamespaceToDirectory->attachByName('wordseparatortocamelcase', ['separator' => '\\']);
-            $this->filterNamespaceToDirectory->attachByName('wordcamelcasetoseparator', ['separator' => '/']);
+            $this->filterNamespaceToDirectory->attachByName(
+                'wordseparatortocamelcase', ['separator' => '\\']
+            );
+            $this->filterNamespaceToDirectory->attachByName(
+                'wordcamelcasetoseparator', ['separator' => DIRECTORY_SEPARATOR]
+            );
         }
         return $this->filterNamespaceToDirectory;
     }