Changeset 1799
- Timestamp:
- 08/24/06 09:05:08 (2 years ago)
- Files:
-
- trunk/data/tasks/sfPakePropel.php (modified) (4 diffs)
- trunk/data/tasks/sfPakePropelAdminGenerator.php (modified) (1 diff)
- trunk/data/tasks/sfPakePropelCrudGenerator.php (modified) (1 diff)
- trunk/lib/addon/propel/sfPropelDatabaseSchema.class.php (modified) (2 diffs)
- trunk/lib/controller/sfController.class.php (modified) (1 diff)
- trunk/lib/helper/AssetHelper.php (modified) (2 diffs)
- trunk/lib/helper/FormHelper.php (modified) (1 diff)
- trunk/lib/helper/ObjectAdminHelper.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/data/tasks/sfPakePropel.php
r1795 r1799 3 3 pake_desc('create classes for current model'); 4 4 pake_task('propel-build-model', 'project_exists'); 5 pake_task('build-model');6 5 7 6 pake_desc('create sql for current model'); 8 7 pake_task('propel-build-sql', 'project_exists'); 9 pake_task('build-sql');10 8 11 9 pake_desc('create schema.xml from existing database'); 12 10 pake_task('propel-build-schema', 'project_exists'); 13 pake_task('build-schema');14 11 15 12 pake_desc('create schema.xml from schema.yml'); … … 24 21 pake_desc('create database for current model'); 25 22 pake_task('propel-build-db', 'project_exists'); 26 pake_task('build-db');27 23 28 24 pake_desc('insert sql for current model'); 29 25 pake_task('propel-insert-sql', 'project_exists'); 30 pake_task('insert-sql');31 26 32 27 pake_desc('generate propel model and sql and initialize database'); … … 35 30 pake_desc('generate propel model and sql and initialize database, and load data'); 36 31 pake_task('propel-build-all-load', 'propel-build-all'); 37 38 function run_build_model($task, $args)39 {40 throw new Exception('This task is deprecated. Please use "propel-build-model".');41 }42 43 function run_build_sql($task, $args)44 {45 throw new Exception('This task is deprecated. Please use "propel-build-sql".');46 }47 48 function run_build_schema($task, $args)49 {50 throw new Exception('This task is deprecated. Please use "propel-build-schema".');51 }52 53 function run_build_db($task, $args)54 {55 throw new Exception('This task is deprecated. Please use "propel-build-db".');56 }57 58 function run_insert_sql($task, $args)59 {60 throw new Exception('This task is deprecated. Please use "propel-insert-sql".');61 }62 32 63 33 function run_propel_convert_yml_schema($task, $args) … … 123 93 file_put_contents('config/'.$prefix.str_replace('.xml', '.yml', $schema), $db_schema->asYAML()); 124 94 } 125 }126 127 function run_build_all($task, $args)128 {129 throw new Exception('This task is deprecated. Please use "propel-build-all".');130 95 } 131 96 trunk/data/tasks/sfPakePropelAdminGenerator.php
r1788 r1799 3 3 pake_desc('initialize a new propel admin module'); 4 4 pake_task('propel-init-admin', 'app_exists'); 5 pake_task('init-propeladmin');6 7 function run_init_propeladmin($task, $args)8 {9 throw new Exception('This task is deprecated. Please use "propel-init-admin".');10 }11 5 12 6 function run_propel_init_admin($task, $args) trunk/data/tasks/sfPakePropelCrudGenerator.php
r1788 r1799 6 6 pake_desc('generate a new propel CRUD module'); 7 7 pake_task('propel-generate-crud', 'app_exists'); 8 9 pake_task('init-propelcrud');10 pake_task('generate-propelcrud');11 12 function run_init_propelcrud($task, $args)13 {14 throw new Exception('This task is deprecated. Please use "propel-init-crud".');15 }16 17 function run_generate_propelcrud($task, $args)18 {19 throw new Exception('This task is deprecated. Please use "propel-generate-crud".');20 }21 8 22 9 function run_propel_init_crud($task, $args) trunk/lib/addon/propel/sfPropelDatabaseSchema.class.php
r1776 r1799 26 26 return array($this->connection_name => $this->database); 27 27 } 28 28 29 29 public function loadYAML($file) 30 30 { … … 38 38 $this->connection_name = array_shift(array_keys($schema)); 39 39 $this->database = $schema[$this->connection_name]; 40 40 41 41 $this->fixYAMLDatabase(); 42 42 $this->fixYAMLI18n(); trunk/lib/controller/sfController.class.php
r1725 r1799 405 405 406 406 /** 407 * Retrieve the singleton instance of this class.408 *409 * @return sfController A sfController implementation instance.410 *411 * @throws sfControllerException If a controller implementation instance has not been created.412 */413 public static function getInstance ()414 {415 $error = 'sfController::getInstance deprecated, use newInstance method instead.';416 throw new sfControllerException($error);417 418 if (isset(self::$instance))419 {420 return self::$instance;421 }422 423 // an instance of the controller has not been created424 $error = 'A sfController implementation instance has not been created';425 426 throw new sfControllerException($error);427 }428 429 /**430 407 * Retrieve the presentation rendering mode. 431 408 * trunk/lib/helper/AssetHelper.php
r1716 r1799 323 323 * @see include_metas 324 324 */ 325 function include_http_metas()325 function include_http_metas() 326 326 { 327 327 foreach (sfContext::getInstance()->getResponse()->getHttpMetas() as $httpequiv => $value) … … 345 345 echo content_tag('title', $title)."\n"; 346 346 } 347 348 /**349 * Returns a list of <script> include tags according to the response attributes.350 *351 * <b>DEPRECATED:</b> JavaScripts are included automatically352 */353 function include_javascripts()354 {355 if (sfConfig::get('sf_logging_active')) sfContext::getInstance()->getLogger()->err('The function "include_javascripts()" is deprecated and not needed anymore.');356 }357 358 /**359 * Returns a list of css <link> tags according to the response attributes.360 *361 * <b>DEPRECATED:</b> stylesheets are included automatically362 */363 function include_stylesheets()364 {365 if (sfConfig::get('sf_logging_active')) sfContext::getInstance()->getLogger()->err('The function "include_stylesheets()" is deprecated and not needed anymore.');366 }trunk/lib/helper/FormHelper.php
r1750 r1799 681 681 682 682 return tag('input', $html_options); 683 }684 685 /**686 * Returns an XHTML compliant <input> tag with type="file".687 *688 * Alias for input_file_tag689 *690 * <b>DEPRECIATED:</b> Use input_file_tag691 * @see input_file_tag692 */693 function input_upload_tag($name, $options = array())694 {695 if (sfConfig::get('sf_logging_active'))696 {697 sfContext::getInstance()->getLogger()->err('This function is deprecated. Please use input_file_tag.');698 }699 700 return input_file_tag($name, $options);701 683 } 702 684 trunk/lib/helper/ObjectAdminHelper.php
r1714 r1799 20 20 * @version SVN: $Id$ 21 21 */ 22 23 function object_admin_input_upload_tag($object, $method, $options = array())24 {25 if (sfConfig::get('sf_logging_active'))26 {27 sfContext::getInstance()->getLogger()->err('This function is deprecated. Please use object_admin_input_file_tag.');28 }29 30 return object_admin_input_file_tag($object, $method, $options);31 }32 22 33 23 function object_admin_input_file_tag($object, $method, $options = array())