Merge pull request #7524 from mbabker/3.5-Composer-Updates

Composer update for Joomla Framework packages and PHPUnit
joomla · Jul 22, 2015 · 5cc6725 · 5cc6725
2 parents 3d80086 + af596f6
commit 5cc6725
Show file tree

Hide file tree

Showing 25 changed files with 469 additions and 326 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/libraries/vendor/composer/autoload_classmap.php b/libraries/vendor/composer/autoload_classmap.php
@@ -6,6 +6,7 @@
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
+    'CallbackFilterIterator' => $vendorDir . '/joomla/compat/src/CallbackFilterIterator.php',
     'JsonSerializable' => $vendorDir . '/joomla/compat/src/JsonSerializable.php',
     'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
     'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',