Skip to content

Commit

Permalink
Correct method casing
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Burke committed Sep 19, 2015
1 parent ff3fe14 commit 11c3d6e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/Cache/Engine/FileEngine.php
Expand Up @@ -383,7 +383,7 @@ protected function _setKey($key, $createKey = false)
if (!$createKey && !$path->isFile()) {
return false;
}
if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
if (empty($this->_File) || $this->_File->getBasename() !== $key) {
$exists = file_exists($path->getPathname());
try {
$this->_File = $path->openFile('c+');
Expand Down Expand Up @@ -463,13 +463,13 @@ public function clearGroup($group)
\RecursiveIteratorIterator::CHILD_FIRST
);
foreach ($contents as $object) {
$containsGroup = strpos($object->getPathName(), DS . $group . DS) !== false;
$containsGroup = strpos($object->getPathname(), DS . $group . DS) !== false;
$hasPrefix = true;
if (strlen($this->_config['prefix']) !== 0) {
$hasPrefix = strpos($object->getBaseName(), $this->_config['prefix']) === 0;
$hasPrefix = strpos($object->getBasename(), $this->_config['prefix']) === 0;
}
if ($object->isFile() && $containsGroup && $hasPrefix) {
$path = $object->getPathName();
$path = $object->getPathname();
$object = null;
//@codingStandardsIgnoreStart
@unlink($path);
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Plugin.php
Expand Up @@ -228,7 +228,7 @@ public static function loadAll(array $options = [])
$dir = new DirectoryIterator($path);
foreach ($dir as $path) {
if ($path->isDir() && !$path->isDot()) {
$plugins[] = $path->getBaseName();
$plugins[] = $path->getBasename();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Filesystem/Folder.php
Expand Up @@ -182,12 +182,12 @@ public function read($sort = true, $exceptions = false, $fullPath = false)
if ($item->isDot()) {
continue;
}
$name = $item->getFileName();
$name = $item->getFilename();
if ($skipHidden && $name[0] === '.' || isset($exceptions[$name])) {
continue;
}
if ($fullPath) {
$name = $item->getPathName();
$name = $item->getPathname();
}
if ($item->isDir()) {
$dirs[] = $name;
Expand Down

0 comments on commit 11c3d6e

Please sign in to comment.