Skip to content

Compile using vendor files #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 25, 2011
Merged

Compile using vendor files #3

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18f0954
Added .gitignore
yuya-takeyama Dec 24, 2011
a6a6bd0
Fixed to use vendor.
yuya-takeyama Dec 24, 2011
83c672f
Fixed to import \Exception.
yuya-takeyama Dec 24, 2011
1d5b5f8
Fixed to use vendor
yuya-takeyama Dec 24, 2011
5c5c28e
Inserted linebreaks into command-line options.
yuya-takeyama Dec 24, 2011
56b8b0e
Fixed to use vendor.
yuya-takeyama Dec 24, 2011
bd35399
Fixed to use vendor.
yuya-takeyama Dec 24, 2011
5cc82a0
Recompile.
yuya-takeyama Dec 24, 2011
46631ce
Merge branch 'feature/compile-using-vendor' into develop
yuya-takeyama Dec 24, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed to use vendor.
  • Loading branch information
@yuya-takeyama
yuya-takeyama committed Dec 24, 2011
commit bd35399ad3b094706dc44b1e45e4fda981735375
12 changes: 0 additions & 12 deletions src/Onion/Command/CompileCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,7 @@ function execute($arguments)
}
else {
$classloader_file = 'Universal/ClassLoader/SplClassLoader.php';
$classloader_path = stream_resolve_include_path($classloader_file);

if( ! $classloader_path ) {
$classloader_path = stream_resolve_include_path( 'phar://onion.phar/' . $classloader_file);
}

if( ! $classloader_path ) {
die($classloader_file . ' not found.');
}

// try to resolve in current phar executable
$content = php_strip_whitespace($classloader_path);
$phar->addFromString($classloader_file,$content);
$stub .=<<<"EOT"
require 'phar://$pharFile/$classloader_file';
\$classLoader = new \\Universal\\ClassLoader\\SplClassLoader;
Expand Down