Merge branch 'release/1.0.4'

nooku · Apr 21, 2015 · 9093ef3 · 9093ef3
2 parents 22e7a28 + 0527ce0
commit 9093ef3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ CHANGELOG
 To get the diff for a specific change, go to https://github.com/nooku/nooku-installer/commit/xxx where xxx is the change hash.
 To view the diff between two versions, go to https://github.com/nooku/nooku-installer/compare/v0.1.0...v0.1.1
 
+## 1.0.4 (2015-04-21)
+
+* Added - Support for `nooku-framework-joomla` package
+
 ## 1.0.3 (2015-03-04)
 
 * Fixed - Fix call to undefined function Composer\Autoload\includeFile() error in Joomla 3.4

diff --git a/src/Nooku/Composer/Installer/NookuFramework.php b/src/Nooku/Composer/Installer/NookuFramework.php
@@ -51,6 +51,6 @@ public function isInstalled(InstalledRepositoryInterface $repo, PackageInterface
 
     protected function _isValidName($packageName)
     {
-        return $packageName === 'nooku/nooku-framework';
+        return in_array($packageName, array('nooku/nooku-framework', 'nooku/nooku-framework-joomla'));
     }
-}
+}