adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-03 10:02:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing visibility on ModelTask and making a private method protected.

Browse source
This commit is contained in:
Mark Story 2010-04-23 21:49:35 -04:00
parent d000a11e9b
commit 854583f0d7
1 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

50
cake/console/libs/tasks/model.php
View file

@ -76,7 +76,7 @@ class ModelTask extends BakeTask {
App::import('Model', 'Model', false); App::import('Model', 'Model', false);
if (empty($this->args)) { if (empty($this->args)) {
$this->__interactive(); $this->_interactive();
} }
if (!empty($this->args[0])) { if (!empty($this->args[0])) {
@ -103,7 +103,7 @@ class ModelTask extends BakeTask {
* *
* @return void * @return void
*/ */
function all() { public function all() {
$this->listAll($this->connection, false); $this->listAll($this->connection, false);
$unitTestExists = $this->_checkUnitTest(); $unitTestExists = $this->_checkUnitTest();
foreach ($this->_tables as $table) { foreach ($this->_tables as $table) {
@ -126,7 +126,7 @@ class ModelTask extends BakeTask {
* @param string $className Name of class you want model to be. * @param string $className Name of class you want model to be.
* @return object Model instance * @return object Model instance
*/ */
function &_getModelObject($className, $table = null) { protected function &_getModelObject($className, $table = null) {
if (!$table) { if (!$table) {
$table = Inflector::tableize($className); $table = Inflector::tableize($className);
} }
@ -142,7 +142,7 @@ class ModelTask extends BakeTask {
* @param integer $default The default option for the given prompt. * @param integer $default The default option for the given prompt.
* @return result of user choice. * @return result of user choice.
*/ */
function inOptions($options, $prompt = null, $default = null) { public function inOptions($options, $prompt = null, $default = null) {
$valid = false; $valid = false;
$max = count($options); $max = count($options);
while (!$valid) { while (!$valid) {
@ -165,7 +165,7 @@ class ModelTask extends BakeTask {
* *
* @access private * @access private
*/ */
function __interactive() { protected function _interactive() {
$this->hr(); $this->hr();
$this->out(sprintf("Bake Model\nPath: %s", $this->path)); $this->out(sprintf("Bake Model\nPath: %s", $this->path));
$this->hr(); $this->hr();
@ -259,10 +259,9 @@ class ModelTask extends BakeTask {
* @param string $modelName Name of the model relations belong to. * @param string $modelName Name of the model relations belong to.
* @param string $type Name of association you want to see. i.e. 'belongsTo' * @param string $type Name of association you want to see. i.e. 'belongsTo'
* @param string $associations Collection of associations. * @param string $associations Collection of associations.
* @access protected
* @return void * @return void
*/ */
function _printAssociation($modelName, $type, $associations) { protected function _printAssociation($modelName, $type, $associations) {
if (!empty($associations[$type])) { if (!empty($associations[$type])) {
for ($i = 0; $i < count($associations[$type]); $i++) { for ($i = 0; $i < count($associations[$type]); $i++) {
$out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias']; $out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias'];
@ -292,7 +291,7 @@ class ModelTask extends BakeTask {
* @param array $fields Array of fields to look for and choose as a displayField * @param array $fields Array of fields to look for and choose as a displayField
* @return mixed Name of field to use for displayField or false if the user declines to choose * @return mixed Name of field to use for displayField or false if the user declines to choose
*/ */
function findDisplayField($fields) { public function findDisplayField($fields) {
$fieldNames = array_keys($fields); $fieldNames = array_keys($fields);
$prompt = __("A displayField could not be automatically detected\nwould you like to choose one?"); $prompt = __("A displayField could not be automatically detected\nwould you like to choose one?");
$continue = $this->in($prompt, array('y', 'n')); $continue = $this->in($prompt, array('y', 'n'));
@ -335,17 +334,15 @@ class ModelTask extends BakeTask {
* *
* @return void * @return void
*/ */
function initValidations() { public function initValidations() {
$options = $choices = array(); $options = $choices = array();
if (class_exists('Validation')) { if (class_exists('Validation')) {
$parent = get_class_methods(get_parent_class('Validation'));
$options = get_class_methods('Validation'); $options = get_class_methods('Validation');
$options = array_diff($options, $parent);
} }
sort($options); sort($options);
$default = 1; $default = 1;
foreach ($options as $key => $option) { foreach ($options as $key => $option) {
if ($option{0} != '_' && strtolower($option) != 'getinstance') { if ($option{0} != '_') {
$choices[$default] = strtolower($option); $choices[$default] = strtolower($option);
$default++; $default++;
} }
@ -361,7 +358,7 @@ class ModelTask extends BakeTask {
* @param array $metaData metadata for field * @param array $metaData metadata for field
* @return array Array of validation for the field. * @return array Array of validation for the field.
*/ */
function fieldValidation($fieldName, $metaData, $primaryKey = 'id') { public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
$defaultChoice = count($this->_validations); $defaultChoice = count($this->_validations);
$validate = $alreadyChosen = array(); $validate = $alreadyChosen = array();
@ -495,7 +492,7 @@ class ModelTask extends BakeTask {
* @param array $associations Array of inprogress associations * @param array $associations Array of inprogress associations
* @return array $associations with belongsTo added in. * @return array $associations with belongsTo added in.
*/ */
function findBelongsTo(&$model, $associations) { public function findBelongsTo(&$model, $associations) {
$fields = $model->schema(true); $fields = $model->schema(true);
foreach ($fields as $fieldName => $field) { foreach ($fields as $fieldName => $field) {
$offset = strpos($fieldName, '_id'); $offset = strpos($fieldName, '_id');
@ -524,7 +521,7 @@ class ModelTask extends BakeTask {
* @param array $associations Array of inprogress associations * @param array $associations Array of inprogress associations
* @return array $associations with hasOne and hasMany added in. * @return array $associations with hasOne and hasMany added in.
*/ */
function findHasOneAndMany(&$model, $associations) { public function findHasOneAndMany(&$model, $associations) {
$foreignKey = $this->_modelKey($model->name); $foreignKey = $this->_modelKey($model->name);
foreach ($this->_tables as $otherTable) { foreach ($this->_tables as $otherTable) {
$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable); $tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
@ -567,7 +564,7 @@ class ModelTask extends BakeTask {
* @param array $associations Array of inprogress associations * @param array $associations Array of inprogress associations
* @return array $associations with hasAndBelongsToMany added in. * @return array $associations with hasAndBelongsToMany added in.
*/ */
function findHasAndBelongsToMany(&$model, $associations) { public function findHasAndBelongsToMany(&$model, $associations) {
$foreignKey = $this->_modelKey($model->name); $foreignKey = $this->_modelKey($model->name);
foreach ($this->_tables as $otherTable) { foreach ($this->_tables as $otherTable) {
$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable); $tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
@ -607,7 +604,7 @@ class ModelTask extends BakeTask {
* @param array $associations Array of associations to be confirmed. * @param array $associations Array of associations to be confirmed.
* @return array Array of confirmed associations * @return array Array of confirmed associations
*/ */
function confirmAssociations(&$model, $associations) { public function confirmAssociations(&$model, $associations) {
foreach ($associations as $type => $settings) { foreach ($associations as $type => $settings) {
if (!empty($associations[$type])) { if (!empty($associations[$type])) {
$count = count($associations[$type]); $count = count($associations[$type]);
@ -635,7 +632,7 @@ class ModelTask extends BakeTask {
* @param array $associations Array of associations. * @param array $associations Array of associations.
* @return array Array of associations. * @return array Array of associations.
*/ */
function doMoreAssociations($model, $associations) { public function doMoreAssociations($model, $associations) {
$prompt = __('Would you like to define some additional model associations?'); $prompt = __('Would you like to define some additional model associations?');
$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n'); $wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
$possibleKeys = $this->_generatePossibleKeys(); $possibleKeys = $this->_generatePossibleKeys();
@ -700,7 +697,7 @@ class ModelTask extends BakeTask {
* *
* @return array array of tables and possible keys * @return array array of tables and possible keys
*/ */
function _generatePossibleKeys() { protected function _generatePossibleKeys() {
$possible = array(); $possible = array();
foreach ($this->_tables as $otherTable) { foreach ($this->_tables as $otherTable) {
$tempOtherModel = & new Model(array('table' => $otherTable, 'ds' => $this->connection)); $tempOtherModel = & new Model(array('table' => $otherTable, 'ds' => $this->connection));
@ -719,9 +716,8 @@ class ModelTask extends BakeTask {
* *
* @param mixed $name Model name or object * @param mixed $name Model name or object
* @param mixed $data if array and $name is not an object assume bake data, otherwise boolean. * @param mixed $data if array and $name is not an object assume bake data, otherwise boolean.
* @access private
*/ */
function bake($name, $data = array()) { public function bake($name, $data = array()) {
if (is_object($name)) { if (is_object($name)) {
if ($data == false) { if ($data == false) {
$data = $associations = array(); $data = $associations = array();
@ -755,9 +751,8 @@ class ModelTask extends BakeTask {
* Assembles and writes a unit test file * Assembles and writes a unit test file
* *
* @param string $className Model class name * @param string $className Model class name
* @access private
*/ */
function bakeTest($className) { public function bakeTest($className) {
$this->Test->interactive = $this->interactive; $this->Test->interactive = $this->interactive;
$this->Test->plugin = $this->plugin; $this->Test->plugin = $this->plugin;
$this->Test->connection = $this->connection; $this->Test->connection = $this->connection;
@ -789,9 +784,9 @@ class ModelTask extends BakeTask {
* *
* @param string $modelName Name of the model you want a table for. * @param string $modelName Name of the model you want a table for.
* @param string $useDbConfig Name of the database config you want to get tables from. * @param string $useDbConfig Name of the database config you want to get tables from.
* @return void * @return string Table name
*/ */
function getTable($modelName, $useDbConfig = null) { public function getTable($modelName, $useDbConfig = null) {
if (!isset($useDbConfig)) { if (!isset($useDbConfig)) {
$useDbConfig = $this->connection; $useDbConfig = $this->connection;
} }
@ -820,7 +815,7 @@ class ModelTask extends BakeTask {
* @param string $useDbConfig Connection name to scan. * @param string $useDbConfig Connection name to scan.
* @return array Array of tables in the database. * @return array Array of tables in the database.
*/ */
function getAllTables($useDbConfig = null) { public function getAllTables($useDbConfig = null) {
if (!isset($useDbConfig)) { if (!isset($useDbConfig)) {
$useDbConfig = $this->connection; $useDbConfig = $this->connection;
} }
@ -910,11 +905,10 @@ class ModelTask extends BakeTask {
* *
* @param string $className Name of class to bake fixture for * @param string $className Name of class to bake fixture for
* @param string $useTable Optional table name for fixture to use. * @param string $useTable Optional table name for fixture to use.
* @access public
* @return void * @return void
* @see FixtureTask::bake * @see FixtureTask::bake
*/ */
function bakeFixture($className, $useTable = null) { public function bakeFixture($className, $useTable = null) {
$this->Fixture->interactive = $this->interactive; $this->Fixture->interactive = $this->interactive;
$this->Fixture->connection = $this->connection; $this->Fixture->connection = $this->connection;
$this->Fixture->plugin = $this->plugin; $this->Fixture->plugin = $this->plugin;