diff --git a/Changelog b/Changelog index ab6f34023..562308694 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2016-03-29 DariusIII + * Upd: Update composer. * Upd: First push of lithium framework 2016-03-27 DariusIII * Upd: Remove unused AmazonProductAPI class. diff --git a/app/config/bootstrap/libraries.php b/app/config/bootstrap/libraries.php index d5fb02f4c..0874404bb 100644 --- a/app/config/bootstrap/libraries.php +++ b/app/config/bootstrap/libraries.php @@ -69,7 +69,7 @@ define('LITHIUM_LIBRARY_PATH', NN_ROOT . 'libraries'); * Locate and load Lithium core library files. Throws a fatal error if the core can't be found. * If your Lithium core directory is named something other than `lithium`, change the string below. */ -if (!include LITHIUM_LIBRARY_PATH . '/lithium/core/Libraries.php') { +if (!include LITHIUM_LIBRARY_PATH . DS . 'lithium' . DS . 'core' . DS . 'Libraries.php') { $message = "Lithium core could not be found. Check the value of LITHIUM_LIBRARY_PATH in "; $message .= __FILE__ . ". It should point to the directory containing your "; $message .= "/libraries directory."; @@ -132,12 +132,12 @@ Libraries::add('app', array('default' => true)); * Add some plugins: */ if (is_dir(LITHIUM_LIBRARY_PATH . DS . 'li3_docs')) { - Libraries::add('li3_docs', ['index' => ['app', 'lithium']]); + Libraries::add('li3_docs', ['index' => ['app', 'lithium', 'li3_docs', 'manual']]); } if (is_dir(LITHIUM_LIBRARY_PATH . DS . 'li3_quality')) { Libraries::add('li3_quality'); } -require_once LITHIUM_APP_PATH . DS . 'libraries/autoload.php'; +require_once LITHIUM_APP_PATH . DS . 'libraries' . DS . 'autoload.php'; ?> diff --git a/composer.json b/composer.json index ca5a0586b..e60d21847 100755 --- a/composer.json +++ b/composer.json @@ -18,6 +18,10 @@ { "type": "vcs", "url": "https://github.com/niel/li3_docs" + }, + { + "type": "vcs", + "url": "https://github.com/unionofrad/manual" } ], "autoload": { @@ -73,6 +77,7 @@ "require-dev": { "unionofrad/li3_docs": "1.1.x-dev", + "unionofrad/manual": "1.1.x-dev", "unionofrad/li3_quality": "1.1.x-dev" }, "type": "project" diff --git a/composer.lock b/composer.lock index 0ee1d5094..e817da0a0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9ec99090b1ceb9c6f7be8a95fe354058", - "content-hash": "8be05dfb72fe7487dbf12c144209eb24", + "hash": "627e89161f239e516ba10fff61d93e99", + "content-hash": "407252da1c63d7a6fc758a9d66437976", "packages": [ { "name": "barracudanetworks/forkdaemon-php", @@ -966,6 +966,43 @@ "source": "https://github.com/niel/li3_quality/tree/1.1" }, "time": "2016-03-22 12:07:46" + }, + { + "name": "unionofrad/manual", + "version": "1.1.x-dev", + "source": { + "type": "git", + "url": "https://github.com/UnionOfRAD/manual.git", + "reference": "7117a85d03045bfe0b4854de6dada100056f7fef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/UnionOfRAD/manual/zipball/7117a85d03045bfe0b4854de6dada100056f7fef", + "reference": "7117a85d03045bfe0b4854de6dada100056f7fef", + "shasum": "" + }, + "require": { + "composer/installers": "*" + }, + "type": "lithium-library", + "license": [ + "BSD-3-clause" + ], + "description": "li3 full-fledged documentation effort.", + "homepage": "https://github.com/UnionOfRAD/manual", + "keywords": [ + "docblock", + "docs", + "documentation", + "documented", + "li3", + "lithium" + ], + "support": { + "source": "https://github.com/UnionOfRAD/manual/tree/1.1", + "issues": "https://github.com/UnionOfRAD/manual/issues" + }, + "time": "2016-01-04 20:29:49" } ], "aliases": [], @@ -976,6 +1013,7 @@ "kbjr/git.php": 20, "unionofrad/lithium": 20, "unionofrad/li3_docs": 20, + "unionofrad/manual": 20, "unionofrad/li3_quality": 20 }, "prefer-stable": false,