All Commits | docs-coverage | master

6d487a2c3101abeb759d59a89bcefc7d1e2e7409

Author: chawbacca

Date: 2009-05-18 09:34:06 -0500

Merge from api_generator.git

diff --git a/api_generator_app_controller.php b/api_generator_app_controller.php index f7042ea..aa744bd 100644 --- a/api_generator_app_controller.php +++ b/api_generator_app_controller.php @@ -1,30 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Generator Plugin App Controller * + * PHP 5.2+ * - * PHP version 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package api_generator - * @subpackage api_generator.controllers - * @since - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiGeneratorAppController extends AppController { /** * theme @@ -42,6 +34,7 @@ class ApiGeneratorAppController extends AppController { * @return void **/ public function beforeFilter() { + parent::beforeFilter(); $this->ApiConfig = ClassRegistry::init('ApiGenerator.ApiConfig'); $this->ApiConfig->read(); $path = $this->ApiConfig->getPath(); @@ -49,10 +42,10 @@ class ApiGeneratorAppController extends AppController { $path = APP; $this->ApiConfig->data['paths'][$path] = true; } - $this->path = Folder::slashTerm(realpath($path)); - $localePaths = Configure::read('localePaths'); - $localePaths[] = dirname(__FILE__) . DS . 'locale'; - Configure::write('localePaths',$localePaths); + $this->path = Folder::slashTerm(realpath($path)); + $localePaths = Configure::read('localePaths'); + $localePaths[] = dirname(__FILE__) . DS . 'locale'; + Configure::write('localePaths', $localePaths); } /** * Error Generating Page. @@ -71,4 +64,4 @@ class ApiGeneratorAppController extends AppController { $this->_stop(); } } -?> \ No newline at end of file +?> diff --git a/api_generator_app_model.php b/api_generator_app_model.php index 300063f..bb35a59 100644 --- a/api_generator_app_model.php +++ b/api_generator_app_model.php @@ -1,31 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * ApiGenerator App Model class * * Base model class for models in ApiGenerator * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiGeneratorAppModel extends AppModel { /** * Inflect a slashed path to url safe path. Trims ApiGenerator.filePath off as well. diff --git a/config/sql/api_generator.php b/config/sql/api_generator.php index 2e2f0b5..cc3e54f 100644 --- a/config/sql/api_generator.php +++ b/config/sql/api_generator.php @@ -1,29 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Generator Schema file. * * Schema file for Api Generator. * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.api_generator.config - * @since - * @version - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.config.sql + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ /** * ApiGenerator Plugin Schema * diff --git a/controllers/api_generator_controller.php b/controllers/api_generator_controller.php index a05dfd2..1f89520 100644 --- a/controllers/api_generator_controller.php +++ b/controllers/api_generator_controller.php @@ -1,30 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Generator Controller * + * PHP 5.2+ * - * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake. - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.controllers + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiGeneratorController extends ApiGeneratorAppController { /** * Name property diff --git a/models/api_class.php b/models/api_class.php index 0d4ebef..faeffdc 100644 --- a/models/api_class.php +++ b/models/api_class.php @@ -1,31 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Class Model * * Used for fetching information from the class index. * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.api_generator.models - * @since - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiClass extends ApiGeneratorAppModel { /** * Name diff --git a/models/api_config.php b/models/api_config.php index 2f326ad..c915bbd 100644 --- a/models/api_config.php +++ b/models/api_config.php @@ -4,23 +4,21 @@ * * For interacting with the Config files for ApiGenerator * + * PHP 5.2+ * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://cakephp.org CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiConfig extends Object { /** * holds data for read diff --git a/models/api_file.php b/models/api_file.php index 3a51251..7521f92 100644 --- a/models/api_file.php +++ b/models/api_file.php @@ -1,32 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * Api File Model * * For interacting with the Filesystem specified by ApiGenerator.filePath * + * PHP 5.2+ * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Vendor', 'ApiGenerator.Introspector'); class ApiFile extends Object { diff --git a/tests/cases/helpers/api_doc.test.php b/tests/cases/helpers/api_doc.test.php index dd48b8c..ba514a5 100644 --- a/tests/cases/helpers/api_doc.test.php +++ b/tests/cases/helpers/api_doc.test.php @@ -1,31 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Doc Helper Test * - * - * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.helpers + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Core', array('View', 'Controller')); App::import('Helper', array('ApiGenerator.ApiDoc', 'Html')); diff --git a/tests/cases/models/api_class.test.php b/tests/cases/models/api_class.test.php index 4a27ef9..7d0583d 100644 --- a/tests/cases/models/api_class.test.php +++ b/tests/cases/models/api_class.test.php @@ -1,30 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * ApiClass test case * - * - * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake.api_generator - * @subpackage cake.api_generator.tests. - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Model', 'ApiGenerator.ApiClass'); App::import('Vendor', 'ApiGenerator.ClassDocumentor'); /** diff --git a/tests/cases/models/api_config.test.php b/tests/cases/models/api_config.test.php index 69a8ef7..c6e1432 100644 --- a/tests/cases/models/api_config.test.php +++ b/tests/cases/models/api_config.test.php @@ -2,23 +2,21 @@ /** * ApiConfig test case * + * PHP 5.2+ * - * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake.api_generator - * @subpackage cake.api_generator.tests. - * @version - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Model', 'ApiGenerator.ApiConfig'); /** * ApiConfigTestCase diff --git a/tests/cases/models/api_file.test.php b/tests/cases/models/api_file.test.php index d8fdc97..46ff21a 100644 --- a/tests/cases/models/api_file.test.php +++ b/tests/cases/models/api_file.test.php @@ -1,30 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * ApiFile test case * + * PHP 5.2+ * - * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake.api_generator - * @subpackage cake.api_generator.tests. - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Model', 'ApiGenerator.ApiFile'); /** diff --git a/tests/cases/models/api_generator_app_model.test.php b/tests/cases/models/api_generator_app_model.test.php index bdb70a3..d71a663 100644 --- a/tests/cases/models/api_generator_app_model.test.php +++ b/tests/cases/models/api_generator_app_model.test.php @@ -1,31 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** - * + * ApiGenerator AppModel test * - * + * PHP 5.2+ * - * PHP versions 4 and 5 - * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ App::import('Model', 'ApiGenerator.AppModel'); class ApiGeneratorAppTestModel extends ApiGeneratorAppModel { diff --git a/tests/cases/vendors/class_documentor.test.php b/tests/cases/vendors/class_documentor.test.php index c71f770..3fc2e61 100644 --- a/tests/cases/vendors/class_documentor.test.php +++ b/tests/cases/vendors/class_documentor.test.php @@ -1,5 +1,25 @@ <?php +/** + * ClassDocumentor test case + * + * PHP 5.2+ + * + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. + * + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ + App::import('Vendor', 'ApiGenerator.ClassDocumentor'); + /** * SimpleDocumentorSubjectClass * @@ -68,7 +88,13 @@ class SimpleDocumentorSubjectClass extends StdClass implements Countable { class TestClassDocumentor extends ClassDocumentor { } -class DocumentExtractorTestCase extends CakeTestCase { +/** + * ClassDocumentor Test Case + * + * @package default + * @author Mark Story + **/ +class ClassDocumentorTestCase extends CakeTestCase { /** * test the ClassInfo introspection * diff --git a/tests/fixtures/api_class_fixture.php b/tests/fixtures/api_class_fixture.php index a059155..7968d3e 100644 --- a/tests/fixtures/api_class_fixture.php +++ b/tests/fixtures/api_class_fixture.php @@ -1,5 +1,22 @@ <?php - +/** + * ApiClass Fixture + * + * PHP 5.2+ + * + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. + * + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.fixtures + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiClassFixture extends CakeTestFixture { var $name = 'ApiClass'; var $fields = array( diff --git a/vendors/class_documentor.php b/vendors/class_documentor.php index c080ecf..5630eec 100644 --- a/vendors/class_documentor.php +++ b/vendors/class_documentor.php @@ -1,13 +1,27 @@ <?php + App::import('Vendor', 'ApiGenerator.Introspector'); /** - * Documentation Extractor + * ClassDocumentor * * Retrieves Documentation using PHP ReflectionClass * - * @package api_generator - */ + * PHP 5.2+ + * + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. + * + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.tests.models + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ClassDocumentor extends ReflectionClass { /** * class Information diff --git a/vendors/css/base.css b/vendors/css/base.css index 20bf2ad..0239c83 100644 --- a/vendors/css/base.css +++ b/vendors/css/base.css @@ -354,6 +354,10 @@ Documentation Page Styles * html .inheritance-tree .parent-class { padding-bottom: 15px; } +/* IE 7 is also not so smart */ +* + html .inheritance-tree .parent-class { + padding-bottom: 15px; +} /* visibility controls */ .doc-controls a { @@ -389,6 +393,12 @@ Documentation Page Styles background-position: top left; background-repeat:none; } +/* IE7 is also stupid */ +* + html .access span { + background-position: top left; + background-repeat:none; +} + .protected span, .protected-static span { background-image: url(../img/icon_protected.gif); @@ -487,17 +497,14 @@ ol.code { padding: 0; font-size: 10px; line-height: 1.8em; - overflow: hidden; color: #999999; text-align: left; list-style:decimal; list-style-position: inside; border: 1px solid #d3d3d0; clear:both; - overflow-x:scroll; } ol.code li { - white-space: nowrap; margin: 0; padding: 0 0 0 1%; background: #fff; diff --git a/vendors/function_documentor.php b/vendors/function_documentor.php index 1ae597f..e456d09 100644 --- a/vendors/function_documentor.php +++ b/vendors/function_documentor.php @@ -1,33 +1,27 @@ <?php -/* SVN FILE: $Id$ */ + +App::import('Vendor', 'ApiGenerator.Introspector'); + /** * Function Documentor Class * * Used for parsing and extracting documentation and introspecting on functions * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.api_generator.vendors - * @since - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ -App::import('Vendor', 'ApiGenerator.Introspector'); - + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.vendors + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class FunctionDocumentor extends ReflectionFunction { /** * Information about the function diff --git a/vendors/introspector.php b/vendors/introspector.php index ca020ec..fbb712a 100644 --- a/vendors/introspector.php +++ b/vendors/introspector.php @@ -1,31 +1,22 @@ <?php -/* SVN FILE: $Id$ */ /** * Introspector Introspect stuff * - * - * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.api_generator.vendors - * @since - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.vendors + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ /** * Introspector provides factory methods and common methods for * reflection parsing diff --git a/vendors/shells/api_index.php b/vendors/shells/api_index.php index 39f2466..600f736 100644 --- a/vendors/shells/api_index.php +++ b/vendors/shells/api_index.php @@ -1,30 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Index generation shell * * Helps generate and maintain Api Class index. * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake. - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.vendors.shells + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ /** * Api Index Shell */ @@ -290,20 +284,22 @@ class ApiIndexShell extends Shell { $this->hr(); $mapping = null; - while($mapping == null && $mapping != 'n') { + while ($mapping == null && $mapping != 'n') { $class = $this->in('Class to map', '', 'n'); if ($class == 'n') { $mapping = 'n'; } else { $file = null; - while($file == null && $file != 'n') { + while ($file == null && $file != 'n') { $file = $this->in('Enter the path to the file that holds ' . $class .'. this can be relative to the default path, or add a / in front to use an absolute path', '', $path); if ($file[0] != '/') { - $file = $path. DS . $file; + $file = $path . DS . $file; } if (file_exists($file)) { $mapping = true; $config['mappings'][$class] = $file; + } else { + $this->out('File could not be found'); } } $stop = $this->in('Add another mapping?', array('y', 'n', 'q'), 'n'); @@ -324,7 +320,8 @@ class ApiIndexShell extends Shell { if ($this->ApiConfig->save($string)) { $this->out('The config was saved'); } - return $this->config = $config; + $this->config = $config; + return $config; } /** * Get help diff --git a/views/api_generator/source.ctp b/views/api_generator/source.ctp index ad15af2..21e6789 100644 --- a/views/api_generator/source.ctp +++ b/views/api_generator/source.ctp @@ -1,5 +1,4 @@ <?php -/* SVN FILE: $Id$ */ /** * Browse view. Shows file listings and provides links to obtaining api docs from a file * Doubles as an ajax view by omitting certain tags when params['isAjax'] is set. diff --git a/views/api_generator/view_file.ctp b/views/api_generator/view_file.ctp index 014d180..90bbaed 100644 --- a/views/api_generator/view_file.ctp +++ b/views/api_generator/view_file.ctp @@ -1,5 +1,4 @@ <?php -/* SVN FILE: $Id$ */ /** * View view. Shows generated api docs from a file. * diff --git a/views/helpers/api_doc.php b/views/helpers/api_doc.php index 4eb89bc..0c6bb60 100644 --- a/views/helpers/api_doc.php +++ b/views/helpers/api_doc.php @@ -1,31 +1,24 @@ <?php -/* SVN FILE: $Id$ */ /** * Api Docs Helper * * Wraps common docs pages view functions * - * PHP versions 4 and 5 + * PHP 5.2+ * - * CakePHP : Rapid Development Framework <http://www.cakephp.org/> - * Copyright 2006-2008, Cake Software Foundation, Inc. - * 1785 E. Sahara Avenue, Suite 490-204 - * Las Vegas, Nevada 89104 + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2006-2008, Cake Software Foundation, Inc. - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project - * @package cake - * @subpackage cake.cake.libs. - * @since CakePHP v 1.2.0.4487 - * @version - * @modifiedby - * @lastmodified - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.views.helpers + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiDocHelper extends AppHelper { /** * Helpers used by ApiDocHelper diff --git a/views/helpers/api_utils.php b/views/helpers/api_utils.php index 8470adb..165a040 100644 --- a/views/helpers/api_utils.php +++ b/views/helpers/api_utils.php @@ -1,5 +1,4 @@ <?php -/* SVN FILE: $Id$ */ /** * Class to style php code as an ordered list. * @@ -12,13 +11,21 @@ * - And to add line-# anchors to each line. * - Removed whitespace reductions. Caused issues with source -> highlight links * - * PHP versions 4 and 5 + * PHP 5.2+ * - * @filesource - * @package api_generator.helpers - * @modifiedby $LastChangedBy: AD7six $ - * @lastmodified $Date: 2008-11-05 11:30:07 +0100 (Wed, 05 Nov 2008) $ - */ + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. + * + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.vendors + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ class ApiUtilsHelper extends AppHelper { /** * constructor diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index f47f1e8..8af5f25 100644 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -1,25 +1,21 @@ <?php -/* SVN FILE: $Id$ */ /** * - * PHP versions 5 + * PHP 5.2+ * - * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org) - * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) + * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) + * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org) - * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project - * @package cake - * @subpackage cake.api_generator.layouts - * @version $Revision$ - * @modifiedby $LastChangedBy$ - * @lastmodified $Date$ - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ + * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://cakephp.org + * @package api_generator + * @subpackage api_generator.views.layouts + * @since ApiGenerator 0.1 + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + **/ ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml">