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

[9.x] Make Application macroable #43966

Merged
merged 2 commits into from
Sep 1, 2022
Merged

[9.x] Make Application macroable #43966

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
f62a571
Make Applicaiton macroable
ralphjsmit Sep 1, 2022
425aaa4
Update FoundationApplicationTest.php
ralphjsmit Sep 1, 2022
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
3 changes: 3 additions & 0 deletions src/Illuminate/Foundation/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Illuminate\Support\Env;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Str;
use Illuminate\Support\Traits\Macroable;
use RuntimeException;
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
Expand All @@ -30,6 +31,8 @@

class Application extends Container implements ApplicationContract, CachesConfiguration, CachesRoutes, HttpKernelInterface
{
use Macroable;

/**
* The Laravel framework version.
*
Expand Down
18 changes: 18 additions & 0 deletions tests/Foundation/FoundationApplicationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Bootstrap\RegisterFacades;
use Illuminate\Foundation\Events\LocaleUpdated;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
use Mockery as m;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -499,6 +500,23 @@ public function testEnvPathsAreAbsoluteInWindows()
$_SERVER['APP_EVENTS_CACHE']
);
}

/** @test */
public function testMacroable(): void
{
$app = new Application;
$app['env'] = 'foo';

$app->macro('foo', function() {
return $this->environment('foo');
});

$this->assertTrue($app->foo());

$app['env'] = 'bar';

$this->assertFalse($app->foo());
}
}

class ApplicationBasicServiceProviderStub extends ServiceProvider
Expand Down