Skip to content

Commit

Permalink
Few more namespace places
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbasso committed Sep 9, 2012
1 parent 617f171 commit 74b6f1e
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Console/Shell.php
Expand Up @@ -826,9 +826,9 @@ protected function _pluginPath($pluginName) {
/**
* Used to enable or disable logging stream output to stdout and stderr
* If you don't wish to see in your stdout or stderr everything that is logged
* through CakeLog, call this function with first param as false
* through Cake Log, call this function with first param as false
*
* @param boolean $enable wheter to enable CakeLog output or not
* @param boolean $enable wheter to enable Cake Log output or not
* @return void
**/
protected function _useLogger($enable = true) {
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Error/BaseException.php
Expand Up @@ -26,7 +26,7 @@
class BaseException extends \RuntimeException {

/**
* Array of headers to be passed to CakeResponse::header()
* Array of headers to be passed to Cake\Network\Response::header()
*
* @var array
*/
Expand All @@ -35,7 +35,7 @@ class BaseException extends \RuntimeException {
/**
* Get/set the response header to be used
*
* See also CakeResponse::header()
* See also Cake\Network\Response::header()
*
* @param string|array $header. An array of header strings or a single header string
* - an associative array of "header name" => "header value"
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Event/EventManager.php
Expand Up @@ -83,7 +83,7 @@ public static function instance($manager = null) {
* Adds a new listener to an event. Listeners
*
* @param callback|Cake\Event\EventListener $callable PHP valid callback type or instance of Cake\Event\EventListener to be called
* when the event named with $eventKey is triggered. If a CakeEventListener instance is passed, then the `implementedEvents`
* when the event named with $eventKey is triggered. If a Cake\Event\EventListener instance is passed, then the `implementedEvents`
* method will be called on the object to register the declared events individually as methods to be managed by this class.
* It is possible to define multiple event handlers per event name.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/TestCase/Log/Engine/FileLogTest.php
Expand Up @@ -21,7 +21,7 @@
use Cake\TestSuite\TestCase;

/**
* CakeLogTest class
* FileLogTest class
*
* @package Cake.Test.Case.Log.Engine
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/TestCase/Utility/DebuggerTest.php
Expand Up @@ -359,7 +359,7 @@ public function testExportVar() {
[protected] _current => null
[protected] _currentType => ''
[protected] _stack => array()
[protected] _eventManager => object(CakeEventManager) {}
[protected] _eventManager => object(Cake\Event\EventManager) {}
[protected] _eventManagerConfigured => false
[private] __viewFileName => null
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/TestCase/View/Helper/TimeHelperTest.php
Expand Up @@ -81,7 +81,7 @@ public function tearDown() {
}

/**
* test CakeTime class methods are called correctly
* test Cake\Utility\Time class methods are called correctly
*/
public function testTimeHelperProxyMethodCalls() {
$methods = array(
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/Utility/Number.php
@@ -1,6 +1,6 @@
<?php
/**
* CakeNumber Utility.
* Cake Number Utility.
*
* Methods to make numbers more readable.
*
Expand Down Expand Up @@ -33,7 +33,7 @@ class Number {

/**
* Currencies supported by the helper. You can add additional currency formats
* with CakeNumber::addFormat
* with Cake\Utility\Number::addFormat
*
* @var array
*/
Expand Down Expand Up @@ -245,8 +245,8 @@ public static function currency($number, $currency = 'USD', $options = array())
*
* {{{ $number->currency($value, 'NOK'); }}}
*
* Added formats are merged with the defaults defined in CakeNumber::$_currencyDefaults
* See CakeNumber::currency() for more information on the various options and their function.
* Added formats are merged with the defaults defined in Cake\Utility\Number::$_currencyDefaults
* See Cake\Utility\Number::currency() for more information on the various options and their function.
*
* @param string $formatName The format name to be used in the future.
* @param array $options The array of options for this format.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Utility/Time.php
@@ -1,6 +1,6 @@
<?php
/**
* CakeTime utility class file.
* Cake Time utility class file.
*
* PHP 5
*
Expand Down
1 change: 0 additions & 1 deletion lib/Cake/basics.php
Expand Up @@ -775,7 +775,6 @@ function __c($msg, $category, $args = null) {
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#LogError
*/
function LogError($message) {
App::uses('CakeLog', 'Log');
$bad = array("\n", "\r", "\t");
$good = ' ';
Log::write('error', str_replace($bad, $good, $message));
Expand Down

0 comments on commit 74b6f1e

Please sign in to comment.