diff --git a/Documentation/Dependencies.md b/Documentation/Dependencies.md index a735df3d1..ac0f63bf9 100644 --- a/Documentation/Dependencies.md +++ b/Documentation/Dependencies.md @@ -6,12 +6,117 @@ Issue Tracking application built on the Joomla! Framework integrating with GitHu ### PHP - Production -#### joomla/framework (dev-master) +#### joomla/application (1.0.*@stable) The Joomla Framework is a platform for writing Web and command line applications in PHP. -* Installed: dev-master fbf3586a735b235a99aa23dd0518bfe9e08ee79c -* Source URL: https://github.com/joomla/joomla-framework.git +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-application.git + +#### joomla/controller (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-controller.git + +#### joomla/database (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-database.git + +#### joomla/date (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-date.git + +#### joomla/filter (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-filter.git + +#### joomla/github (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-github.git + +#### joomla/http (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-http.git + +#### joomla/input (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-input.git + +#### joomla/model (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-model.git + +#### joomla/profiler (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-profiler.git + +#### joomla/registry (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-registry.git + +#### joomla/router (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-router.git + +#### joomla/string (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-string.git + +#### joomla/uri (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-uri.git + +#### joomla/utilities (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-utilities.git + +#### joomla/view (1.0.*@stable) + +The Joomla Framework is a platform for writing Web and command line applications in PHP. + +* Installed: 1.0 +* Source URL: https://github.com/joomla/joomla-framework-view.git #### symfony/http-foundation (2.3.*@stable) @@ -24,7 +129,7 @@ Symfony HttpFoundation Component Twig, the flexible, fast, and secure template language for PHP -* Installed: v1.14.2 +* Installed: v1.15.0 * Source URL: https://github.com/fabpot/Twig.git #### elkuku/g11n (2.1) diff --git a/cli/CliApp/Command/Make/Depfile.php b/cli/CliApp/Command/Make/Depfile.php index f695566b8..20629eea5 100644 --- a/cli/CliApp/Command/Make/Depfile.php +++ b/cli/CliApp/Command/Make/Depfile.php @@ -181,17 +181,28 @@ private function getSorted(array $defined, array $packages) if (isset($packages['composer'][$packageName])) { - $package = $packages['composer'][$packageName]; + $item->description = $packages['composer'][$packageName]->description; + $item->installed = $packages['composer'][$packageName]->version; + $item->sourceURL = $packages['composer'][$packageName]->sourceURL; - $item->description = $package->description; - $item->installed = $package->version; - $item->sourceURL = $package->sourceURL; - - if ('dev-master' == $package->version) + if ('dev-master' == $packages['composer'][$packageName]->version) { - $item->sourceRef = $package->sourceRef; + $item->sourceRef = $packages['composer'][$packageName]->sourceRef; } } + elseif (0 === strpos($packageName, 'joomla/')) + { + // Composer automagically installs the whole Joomla! Framework. + // Add a special handling... + + $item->description = $packages['composer']['joomla/framework']->description; + $item->installed = $packages['composer']['joomla/framework']->version; + $item->sourceURL = preg_replace( + '/framework.git/', + 'framework-'. substr($packageName, strpos($packageName, '/') + 1) .'.git', + $packages['composer']['joomla/framework']->sourceURL + ); + } $items[] = $item; } @@ -201,18 +212,18 @@ private function getSorted(array $defined, array $packages) foreach ($defined['bower']->dependencies as $packageName => $version) { - $package = $packages['bower'][$packageName]; + $installed = $packages['bower'][$packageName]; $item = new \stdClass; $item->packageName = $packageName; $item->version = $version; $item->description = ''; - $item->sourceURL = $package->sourceURL; + $item->sourceURL = $installed->sourceURL; - if ($package->description) + if ($installed->description) { - $item->description = $package->description; + $item->description = $installed->description; } $sorted['javascript'][] = $item; diff --git a/composer.json b/composer.json index 0ac041a32..0f14792a2 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,22 @@ "version": "1.0.0-beta", "require": { "php": ">=5.3.10", - "joomla/framework": "dev-master", + "joomla/application": "1.0.*@stable", + "joomla/controller": "1.0.*@stable", + "joomla/database": "1.0.*@stable", + "joomla/date": "1.0.*@stable", + "joomla/filter": "1.0.*@stable", + "joomla/github": "1.0.*@stable", + "joomla/http": "1.0.*@stable", + "joomla/input": "1.0.*@stable", + "joomla/model": "1.0.*@stable", + "joomla/profiler": "1.0.*@stable", + "joomla/registry": "1.0.*@stable", + "joomla/router": "1.0.*@stable", + "joomla/string": "1.0.*@stable", + "joomla/uri": "1.0.*@stable", + "joomla/utilities": "1.0.*@stable", + "joomla/view": "1.0.*@stable", "symfony/http-foundation": "2.3.*@stable", "twig/twig": "1.*@stable", "elkuku/g11n": "2.1", diff --git a/composer.lock b/composer.lock index 6fd653857..1a81ba65d 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "11ba72303b3067148bcb9015670199b9", + "hash": "adb4be17f36f0074a8559ac1f928da77", "packages": [ { "name": "elkuku/console-progressbar", @@ -87,16 +87,16 @@ }, { "name": "joomla/framework", - "version": "dev-master", + "version": "1.0", "source": { "type": "git", "url": "https://github.com/joomla/joomla-framework.git", - "reference": "fbf3586a735b235a99aa23dd0518bfe9e08ee79c" + "reference": "3db74e6f9bbf151c0e73425887921cb239ad1e0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla/joomla-framework/zipball/fbf3586a735b235a99aa23dd0518bfe9e08ee79c", - "reference": "fbf3586a735b235a99aa23dd0518bfe9e08ee79c", + "url": "https://api.github.com/repos/joomla/joomla-framework/zipball/3db74e6f9bbf151c0e73425887921cb239ad1e0e", + "reference": "3db74e6f9bbf151c0e73425887921cb239ad1e0e", "shasum": "" }, "require": { @@ -169,7 +169,7 @@ "framework", "joomla" ], - "time": "2013-11-28 18:21:07" + "time": "2013-12-01 00:38:39" }, { "name": "psr/log", @@ -177,12 +177,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "134145e8d08ddcb9bb8f49a2feb9aa1f2393650c" + "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/134145e8d08ddcb9bb8f49a2feb9aa1f2393650c", - "reference": "134145e8d08ddcb9bb8f49a2feb9aa1f2393650c", + "url": "https://api.github.com/repos/php-fig/log/zipball/5144da9525d24346bf009ff28f10cbaa1f0f166e", + "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e", "shasum": "" }, "type": "library", @@ -212,7 +212,7 @@ "psr", "psr-3" ], - "time": "2013-11-19 10:21:35" + "time": "2013-12-05 15:25:07" }, { "name": "symfony/http-foundation", @@ -266,16 +266,16 @@ }, { "name": "twig/twig", - "version": "v1.14.2", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64" + "reference": "85e4ff98000157ff753d934b9f13659a953f5666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/ca445842fcea4f844d68203ffa2d00f5e3cdea64", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666", + "reference": "85e4ff98000157ff753d934b9f13659a953f5666", "shasum": "" }, "require": { @@ -284,7 +284,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -311,7 +311,7 @@ "keywords": [ "templating" ], - "time": "2013-10-30 08:20:53" + "time": "2013-12-06 07:47:10" } ], "packages-dev": [ @@ -522,7 +522,22 @@ ], "minimum-stability": "dev", "stability-flags": { - "joomla/framework": 20, + "joomla/application": 0, + "joomla/controller": 0, + "joomla/database": 0, + "joomla/date": 0, + "joomla/filter": 0, + "joomla/github": 0, + "joomla/http": 0, + "joomla/input": 0, + "joomla/model": 0, + "joomla/profiler": 0, + "joomla/registry": 0, + "joomla/router": 0, + "joomla/string": 0, + "joomla/uri": 0, + "joomla/utilities": 0, + "joomla/view": 0, "symfony/http-foundation": 0, "twig/twig": 0, "filp/whoops": 0 diff --git a/src/JTracker/Application.php b/src/JTracker/Application.php index d045e3173..0be1652ee 100644 --- a/src/JTracker/Application.php +++ b/src/JTracker/Application.php @@ -16,7 +16,6 @@ use Joomla\Application\AbstractWebApplication; use Joomla\Controller\ControllerInterface; -use Joomla\Event\Dispatcher; use Joomla\Registry\Registry; use JTracker\Authentication\Exception\AuthenticationException; @@ -100,7 +99,6 @@ public function __construct() ->registerServiceProvider(new GitHubProvider); $this->loadLanguage() - ->loadDispatcher() ->mark('Application started'); } @@ -542,26 +540,6 @@ public function setUserState($key, $value) return null; } - /** - * Allows the application to load a custom or default dispatcher. - * - * The logic and options for creating this object are adequately generic for default cases - * but for many applications it will make sense to override this method and create event - * dispatchers, if required, based on more specific needs. - * - * @param Dispatcher $dispatcher An optional dispatcher object. If omitted, the factory dispatcher is created. - * - * @return $this Method allows chaining - * - * @since 1.0 - */ - public function loadDispatcher(Dispatcher $dispatcher = null) - { - $this->dispatcher = ($dispatcher === null) ? new Dispatcher : $dispatcher; - - return $this; - } - /** * Get the current project. * diff --git a/src/JTracker/Controller/AbstractTrackerController.php b/src/JTracker/Controller/AbstractTrackerController.php index 971d44b0e..77cbb8cc7 100644 --- a/src/JTracker/Controller/AbstractTrackerController.php +++ b/src/JTracker/Controller/AbstractTrackerController.php @@ -11,7 +11,7 @@ use Joomla\Application\AbstractApplication; use Joomla\Controller\AbstractController; use Joomla\Input\Input; -use Joomla\Log\Log; + use JTracker\Application; use JTracker\View\AbstractTrackerHtmlView; @@ -102,16 +102,14 @@ protected function checkEditId($context, $id) if (defined('JDEBUG') && JDEBUG) { - Log::add( + $this->getApplication()->getLogger()->info( sprintf( 'Checking edit ID %s.%s: %d %s', $context, $id, (int) $result, str_replace("\n", ' ', print_r($values, 1)) - ), - Log::INFO, - 'controller' + ) ); } @@ -240,15 +238,13 @@ protected function holdEditId($context, $id) if (defined('JDEBUG') && JDEBUG) { - Log::add( + $this->getApplication()->getLogger()->info( sprintf( 'Holding edit ID %s.%s %s', $context, $id, str_replace("\n", ' ', print_r($values, 1)) - ), - Log::INFO, - 'controller' + ) ); } } @@ -279,15 +275,13 @@ protected function releaseEditId($context, $id) if (defined('JDEBUG') && JDEBUG) { - Log::add( + $this->getApplication()->getLogger()->info( sprintf( 'Releasing edit ID %s.%s %s', $context, $id, str_replace("\n", ' ', print_r($values, 1)) - ), - Log::INFO, - 'controller' + ) ); } }