Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use locator instead of CACHE_DIR

Browse Source
This commit is contained in:
Flavio Copes 2016-04-22 18:39:10 +02:00
parent ecf51536b9
commit cd31d41b07
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/Grav/Common/File/CompiledFile.php
View File

@ -1,6 +1,7 @@
<?php
namespace Grav\Common\File;
use Grav\Common\Grav;
use RocketTheme\Toolbox\File\PhpFile;
/**
@ -28,7 +29,8 @@ trait CompiledFile
// If nothing has been loaded, attempt to get pre-compiled version of the file first.
if ($var === null && $this->raw === null && $this->content === null) {
$key = md5($this->filename);
$file = PhpFile::instance(CACHE_DIR . "compiled/files/{$key}{$this->extension}.php");
$cache_dir = Grav::instance()['locator']->findResource('cache://', true);
$file = PhpFile::instance($cache_dir . "compiled/files/{$key}{$this->extension}.php");
$modified = $this->modified();
if (!$modified) {

4
system/src/Grav/Common/GPM/Installer.php
View File

@ -2,6 +2,7 @@
namespace Grav\Common\GPM;
use Grav\Common\Filesystem\Folder;
use Grav\Common\Grav;
class Installer
{
@ -80,7 +81,8 @@ class Installer
$zip = new \ZipArchive();
$archive = $zip->open($package);
$tmp = CACHE_DIR . 'tmp/Grav-' . uniqid();
$cache_dir = Grav::instance()['locator']->findResource('cache://', true);
$tmp = $cache_dir . 'tmp/Grav-' . uniqid();
if ($archive !== true) {
self::$error = self::ZIP_OPEN_ERROR;

4
system/src/Grav/Console/Gpm/InstallCommand.php
View File

@ -6,6 +6,7 @@ use Grav\Common\GPM\GPM;
use Grav\Common\GPM\Installer;
use Grav\Common\GPM\Response;
use Grav\Common\GPM\Remote\Package as Package;
use Grav\Common\Grav;
use Grav\Common\Utils;
use Grav\Console\ConsoleCommand;
use Symfony\Component\Console\Input\InputArgument;
@ -530,7 +531,8 @@ class InstallCommand extends ConsoleCommand
*/
private function downloadPackage($package)
{
$this->tmp = CACHE_DIR . DS . 'tmp/Grav-' . uniqid();
$cache_dir = Grav::instance()['locator']->findResource('cache://', true);
$this->tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
$filename = $package->slug . basename($package->zipball_url);
$output = Response::get($package->zipball_url, [], [$this, 'progress']);

4
system/src/Grav/Console/Gpm/SelfupgradeCommand.php
View File

@ -5,6 +5,7 @@ use Grav\Common\Filesystem\Folder;
use Grav\Common\GPM\Installer;
use Grav\Common\GPM\Response;
use Grav\Common\GPM\Upgrader;
use Grav\Common\Grav;
use Grav\Console\ConsoleCommand;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputOption;
@ -173,7 +174,8 @@ class SelfupgradeCommand extends ConsoleCommand
*/
private function download($package)
{
$this->tmp = CACHE_DIR . DS . 'tmp/Grav-' . uniqid();
$cache_dir = Grav::instance()['locator']->findResource('cache://', true);
$this->tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
$output = Response::get($package['download'], [], [$this, 'progress']);
Folder::mkdir($this->tmp);