Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove file_get_contents that was incorrectly put in v5 #8854

Merged
merged 2 commits into from Dec 10, 2022
Merged

remove file_get_contents that was incorrectly put in v5 #8854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ee4b4a
remove file_get_contents that was incorrectly put in v5
kkmuffme Dec 7, 2022
d3ec894
use safeFileGetContents in ProjectCacheProvider too
kkmuffme Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Psalm/Internal/Provider/ParserCacheProvider.php
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@

use function clearstatcache;
use function error_log;
use function file_get_contents;
use function file_put_contents;
use function filemtime;
use function gettype;
Expand Down Expand Up @@ -170,7 +169,7 @@ private function getExistingFileContentHashes(): array
throw new UnexpectedValueException('No cache directory defined');
}
if (is_readable($file_hashes_path)) {
$hashes_encoded = (string) file_get_contents($file_hashes_path);
$hashes_encoded = Providers::safeFileGetContents($file_hashes_path);

if (!$hashes_encoded) {
error_log('Unexpected value when loading from file content hashes');
Expand Down
9 changes: 5 additions & 4 deletions src/Psalm/Internal/Provider/ProjectCacheProvider.php
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
namespace Psalm\Internal\Provider;

use Psalm\Config;
use Psalm\Internal\Provider\Providers;

use function file_exists;
use function file_get_contents;
use function file_put_contents;
use function filemtime;
use function hash;
Expand Down Expand Up @@ -72,7 +72,8 @@ public function getLastRun(string $psalm_version): int

$run_cache_location = $cache_directory . DIRECTORY_SEPARATOR . self::GOOD_RUN_NAME;

if (file_exists($run_cache_location) && file_get_contents($run_cache_location) === $psalm_version) {
if (file_exists($run_cache_location)
&& Providers::safeFileGetContents($run_cache_location) === $psalm_version) {
$this->last_run = filemtime($run_cache_location);
} else {
$this->last_run = 0;
Expand All @@ -88,7 +89,7 @@ public function hasLockfileChanged(): bool
return true;
}

$lockfile_contents = file_get_contents($this->composer_lock_location);
$lockfile_contents = Providers::safeFileGetContents($this->composer_lock_location);

if (!$lockfile_contents) {
return true;
Expand Down Expand Up @@ -132,7 +133,7 @@ protected function getComposerLockHash(): string
$lock_hash_location = $cache_directory . DIRECTORY_SEPARATOR . self::COMPOSER_LOCK_HASH;

if (file_exists($lock_hash_location)) {
$this->composer_lock_hash = file_get_contents($lock_hash_location) ?: '';
$this->composer_lock_hash = Providers::safeFileGetContents($lock_hash_location) ?: '';
} else {
$this->composer_lock_hash = '';
}
Expand Down