Compiler bugfix #11

Merged
merged 3 commits into from May 27, 2012

Conversation

Projects
None yet
3 participants
Contributor

wjzijderveld commented May 27, 2012

Although .composer/autoload.php triggered an error the method is deprecated, the Compiler stil included the .composer files.
This PR changes the Compiler to use the new directory.

Willem-Jan Zijderveld added some commits May 27, 2012

@stof stof commented on an outdated diff May 27, 2012

src/Cilex/Compiler.php
@@ -64,11 +64,14 @@ public function compile($pharFile = 'cilex.phar')
}
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../LICENSE'), false);
+
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload.php'));
@stof

stof May 27, 2012

Owner

you should remove this file entirely

@stof stof commented on an outdated diff May 27, 2012

src/Cilex/Compiler.php
$this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload.php'));
- $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/ClassLoader.php'));
- $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload_namespaces.php'));
- $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/.composer/autoload_classmap.php'));
-
+
+ $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload.php'));
@stof

stof May 27, 2012

Owner

wrong indentation

Owner

wjzijderveld commented on 78362ce May 27, 2012

Sorry, used another editor then I usually do. So tabs weren't converted to spaces.
Removed the .composer autoload as well.

@mvriel mvriel added a commit that referenced this pull request May 27, 2012

@mvriel mvriel Merge pull request #11 from wjzijderveld/master
Compiler bugfix
c9db6dc

@mvriel mvriel merged commit c9db6dc into Cilex:master May 27, 2012

Owner

mvriel commented May 27, 2012

Thank you for this pull request!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment