adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix whitespace errors.

Browse source
This commit is contained in:
mark_story 2012-09-13 21:05:10 -04:00
parent 5081be171f
commit c13ed3366b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Utility/ClassRegistry.php
View file

@ -165,7 +165,7 @@ class ClassRegistry {
$instance = $reflection->newInstance(); $instance = $reflection->newInstance();
} }
if ($strict && !$instance instanceof Model) { if ($strict && !$instance instanceof Model) {
$instance = null; $instance = null;
} }
} }
if (!isset($instance)) { if (!isset($instance)) {

6
lib/Cake/Utility/Folder.php
View file

@ -44,7 +44,7 @@ class Folder {
* @constant SKIP * @constant SKIP
*/ */
const SKIP = 'skip'; const SKIP = 'skip';
/** /**
* Path to Folder. * Path to Folder.
* *
@ -658,7 +658,7 @@ class Folder {
while (($item = readdir($handle)) !== false) { while (($item = readdir($handle)) !== false) {
$to = Folder::addPathElement($toDir, $item); $to = Folder::addPathElement($toDir, $item);
if (($options['scheme'] != Folder::SKIP || !is_dir($to)) && !in_array($item, $exceptions)) { if (($options['scheme'] != Folder::SKIP || !is_dir($to)) && !in_array($item, $exceptions)) {
$from = Folder::addPathElement($fromDir, $item); $from = Folder::addPathElement($fromDir, $item);
if (is_file($from)) { if (is_file($from)) {
if (copy($from, $to)) { if (copy($from, $to)) {
chmod($to, intval($mode, 8)); chmod($to, intval($mode, 8));
@ -668,7 +668,7 @@ class Folder {
$this->_errors[] = __d('cake_dev', '%s NOT copied to %s', $from, $to); $this->_errors[] = __d('cake_dev', '%s NOT copied to %s', $from, $to);
} }
} }
if (is_dir($from) && file_exists($to) && $options['scheme'] == Folder::OVERWRITE) { if (is_dir($from) && file_exists($to) && $options['scheme'] == Folder::OVERWRITE) {
$this->delete($to); $this->delete($to);
} }