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

Move storage directory into the app directory #894

Merged
merged 5 commits into from
Jan 31, 2023
Merged

Move storage directory into the app directory #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84ca235
Move the storage directory into the app directory
caendesilva Jan 31, 2023
0de832a
Register custom storage path
caendesilva Jan 31, 2023
ba78c77
Update cached packages path
caendesilva Jan 31, 2023
5b30d56
Update build manifest path
caendesilva Jan 31, 2023
d547ae6
Update develop.iml for new storage directory location
caendesilva Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .idea/develop.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 storage/app/.gitignore → app/storage/app/.gitignore
View file
Open in desktop
File renamed without changes.
0 storage/framework/cache/.gitignore → app/storage/framework/cache/.gitignore
View file
Open in desktop
File renamed without changes.
0 storage/framework/cache/data/.gitignore → app/storage/framework/cache/data/.gitignore
View file
Open in desktop
File renamed without changes.
0 storage/framework/views/.gitignore → app/storage/framework/views/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/framework/src/Console/Commands/PackageDiscoverCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class PackageDiscoverCommand extends BaseCommand

public function handle(PackageManifest $manifest): void
{
$manifest->manifestPath = Hyde::path('storage/framework/cache/packages.php');
$manifest->manifestPath = Hyde::path('app/storage/framework/cache/packages.php');
parent::handle($manifest);
}
}
4 changes: 3 additions & 1 deletion packages/framework/src/Foundation/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*/
class Application extends \LaravelZero\Framework\Application
{
protected $storagePath = 'app/storage';

/**
* {@inheritdoc}
*/
Expand All @@ -25,6 +27,6 @@ protected function registerBaseBindings(): void
public function getCachedPackagesPath(): string
{
// Since we have a custom path for the cache directory, we need to return it here.
return 'storage/framework/cache/packages.php';
return 'app/storage/framework/cache/packages.php';
}
}
2 changes: 1 addition & 1 deletion ...ages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected function getManifestPath(): string
{
return Hyde::path(config(
'hyde.build_manifest_path',
'storage/framework/cache/build-manifest.json'
'app/storage/framework/cache/build-manifest.json'
));
}

Expand Down
4 changes: 2 additions & 2 deletions packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public function test_package_discover_command_can_run()
public function test_package_discover_command_registers_manifest_path()
{
$this->artisan('package:discover')->assertExitCode(0);
$this->assertEquals(Hyde::path('storage/framework/cache/packages.php'),
$this->assertEquals(Hyde::path('app/storage/framework/cache/packages.php'),
$this->app->make(PackageManifest::class)->manifestPath);
$this->assertFileExists(Hyde::path('storage/framework/cache/packages.php'));
$this->assertFileExists(Hyde::path('app/storage/framework/cache/packages.php'));
}
}
4 changes: 2 additions & 2 deletions packages/framework/tests/Unit/GenerateBuildManifestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public function test_action_generates_build_manifest()
{
(new GenerateBuildManifest())->run();

$this->assertFileExists(Hyde::path('storage/framework/cache/build-manifest.json'));
$this->assertFileExists(Hyde::path('app/storage/framework/cache/build-manifest.json'));

$manifest = json_decode(file_get_contents(Hyde::path('storage/framework/cache/build-manifest.json')), true);
$manifest = json_decode(file_get_contents(Hyde::path('app/storage/framework/cache/build-manifest.json')), true);

$this->assertIsArray($manifest);

Expand Down