Skip to content

Commit

Permalink
Remove deprecations.
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Jul 10, 2014
1 parent 64ca5c2 commit e268e0b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 41 deletions.
25 changes: 0 additions & 25 deletions src/Datasource/ConnectionManager.php
Expand Up @@ -135,29 +135,4 @@ public static function get($name, $useAliases = true) {
return static::$_registry->load($name, static::$_config[$name]);
}

/**
* Gets a reference to a DataSource object
*
* @param string $name The name of the DataSource, as defined in app/Config/datasources.php
* @return DataSource Instance
* @throws \Cake\Error\MissingDatasourceConfigException
* @deprecated Will be removed in 3.0 stable.
*/
public static function getDataSource($name) {
return static::get($name);
}

/**
* Dynamically creates a DataSource object at runtime, with the given name and settings
*
* @param string $name The DataSource name
* @param array $config The DataSource configuration settings
* @return DataSource A reference to the DataSource object, or null if creation failed
* @deprecated Will be removed in 3.0 stable
*/
public static function create($name = '', array $config = array()) {
static::config($name, $config);
return static::get($name);
}

}
14 changes: 0 additions & 14 deletions src/Validation/Validation.php
Expand Up @@ -103,20 +103,6 @@ public static function lengthBetween($check, $min, $max) {
return ($length >= $min && $length <= $max);
}

/**
* Alias of Validator::lengthBetween() for backwards compatibility.
*
* @param string $check Value to check for length
* @param int $min Minimum value in range (inclusive)
* @param int $max Maximum value in range (inclusive)
* @return bool Success
* @see Validator::lengthBetween()
* @deprecated 2.6 Use Validator::lengthBetween() instead.
*/
public static function between($check, $min, $max) {
return self::lengthBetween($check, $min, $max);
}

/**
* Returns true if field is left blank -OR- only whitespace characters are present in its value
* Whitespace characters include Space, Tab, Carriage Return, Newline
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/TextHelper.php
Expand Up @@ -281,7 +281,7 @@ public function stripLinks($text) {
*
* ### Options:
*
* - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated)
* - `ellipsis` Will be used as Ending and appended to the trimmed string
* - `exact` If false, $text will not be cut mid-word
* - `html` If true, HTML tags would be handled correctly
*
Expand Down
Expand Up @@ -34,7 +34,7 @@ use Cake\Core\Configure;
</p>
<?php
if (!empty($filePresent)):
$connected = ConnectionManager::getDataSource('default');
$connected = ConnectionManager::get('default');
?>
<p>
<span class="notice">
Expand Down

0 comments on commit e268e0b

Please sign in to comment.