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

Fixing annotations namespace #48

Merged
merged 3 commits into from
Jul 19, 2018
Merged

Fixing annotations namespace #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68ccfae
Fixing annotations namespace
moufmouf Jul 19, 2018
ad30460
Merge branch '10.0' of github.com:moufmouf/mvc.splash-common into 10.0
moufmouf Jul 19, 2018
0e165ba
Fixinng PHP versions in Travis
moufmouf Jul 19, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 7.0
- 7.1
- 7.2

before_script:
- composer install --no-interaction
Expand Down
2 changes: 1 addition & 1 deletion src/Mouf/Mvc/Splash/Services/MoufExplorerUrlProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MoufExplorerUrlProvider implements UrlProviderInterface
public function getUrlsList($instanceName)
{
$moufManager = MoufManager::getMoufManager();
$instanceNames = $moufManager->findInstances('Mouf\\Mvc\\Splash\\Services\\UrlProviderInterface');
$instanceNames = $moufManager->findInstances(UrlProviderInterface::class);

$urls = array();

Expand Down
10 changes: 5 additions & 5 deletions src/Mouf/Mvc/Splash/Services/SplashCreateControllerService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ public function generate(MoufManager $moufManager, $controllerName, $instanceNam
?>
namespace <?= $namespace ?>;

use Mouf\Mvc\Splash\Annotations\Get;
use Mouf\Mvc\Splash\Annotations\Post;
use Mouf\Mvc\Splash\Annotations\Put;
use Mouf\Mvc\Splash\Annotations\Delete;
use Mouf\Mvc\Splash\Annotations\URL;
use TheCodingMachine\Splash\Annotations\Get;
use TheCodingMachine\Splash\Annotations\Post;
use TheCodingMachine\Splash\Annotations\Put;
use TheCodingMachine\Splash\Annotations\Delete;
use TheCodingMachine\Splash\Annotations\URL;
<?php if ($injectTemplate) {
?>
use Mouf\Html\Template\TemplateInterface;
Expand Down