Skip to content

Commit

Permalink
put back my code
Browse files Browse the repository at this point in the history 
Ok, travis is just broken. Back to the version I liked.
  • Loading branch information
@ptarjan
ptarjan committed Nov 21, 2013
1 parent bbb5e2c commit 7a76a3e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/Assetic/Factory/Loader/BasePhpFormulaLoader.php
View file
Expand Up @@ -108,7 +108,12 @@ private function processCall($call, array $protoOptions = array())
$call,
'echo serialize($_call);',
)));
$args = unserialize(shell_exec('php '.escapeshellarg($tmp)));
if (defined('PHP_BINARY')) {
$binary = PHP_BINARY;
} else {
$binary = 'php';
}
$args = unserialize(shell_exec($binary.' '.escapeshellarg($tmp)));
unlink($tmp);

$inputs = isset($args[0]) ? self::argumentToArray($args[0]) : array();
Expand Down

3 comments on commit 7a76a3e

@dustingraham
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptarjan Just a note, on my local machine PHP_BINARY is defined, but resolves to C:\xampp\apache\bin\httpd.exe and C:\xampp\apache\bin\httpd.exe artisan epicly fails.

@ptarjan
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dustingraham That is when running through a web server I suppose. Does normal assetic code run through this function or just test code?

@dustingraham
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptarjan No idea! I was just browsing the issues, and hadn't ever used PHP_BINARY before so thought I'd test it. Wanted to give you a heads up in case this was the reason unit tests were failing.

Please sign in to comment.