This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
// Use statements. | |
class FileController extends Controller | |
{ | |
public function show(ShowFileRequest $request, $slug) | |
{ | |
$media = Media::where('slug', $slug)->first(); | |
$handler = new \Symfony\Component\HttpFoundation\File\File($media->getPath()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/* | |
People are seeing test speeds improve by 15-55%. | |
Results will vary depending on how much user seeding and hasing your tests are doing. | |
Now included in laravel/laravel by default: https://github.com/laravel/laravel/pull/4517 | |
*/ | |
namespace Tests; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
``` | |
git fetch upstream | |
git checkout remote_branch | |
git reset --hard upstream/remote_branch | |
git checkout working_branch | |
git reset --hard upstream/remote_branch | |
git cherry-pick commit // The one that you need to keep. | |
git push -f origin local_branch:local_branch | |
``` |