EBernhardson has submitted this change and it was merged.
Change subject: Namespace the Application class
......................................................................
Namespace the Application class
Change-Id: I9f9cda7537b88d36af0bf9b61db264697929e6a0
---
M app.php
M src/OAuth/OAuthProvider.php
A src/RelevanceScoring/Application.php
M src/RelevanceScoring/Controller/ImportController.php
M src/RelevanceScoring/Controller/QueriesController.php
M src/RelevanceScoring/Controller/ScoresController.php
M src/RelevanceScoring/RelevanceScoringProvider.php
M tests/unit/ApplicationTest.php
8 files changed, 21 insertions(+), 12 deletions(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/app.php b/app.php
index a352fff..4175332 100644
--- a/app.php
+++ b/app.php
@@ -4,12 +4,10 @@
require_once __DIR__.'/vendor/autoload.php';
-class Application extends Silex\Application
-{
- use Silex\Application\UrlGeneratorTrait;
- use Silex\Application\TwigTrait;
-}
-$app = new Application();
+// @todo traits are convenient, but perhaps things would be a bit
+// cleaner to use native Silex App and be explicit about things we
+// currently access through the traits.
+$app = new WikiMedia\RelevanceScoring\Application();
$app->register(new Silex\Provider\SessionServiceProvider());
diff --git a/src/OAuth/OAuthProvider.php b/src/OAuth/OAuthProvider.php
index 9fd5246..e1eebb7 100644
--- a/src/OAuth/OAuthProvider.php
+++ b/src/OAuth/OAuthProvider.php
@@ -2,12 +2,12 @@
namespace WikiMedia\OAuth;
-use Application;
use Silex\ControllerProviderInterface;
use Silex\ServiceProviderInterface;
use Symfony\Component\HttpFoundation\Request;
use Silex\ControllerCollection;
use WikiMedia\OAuth\Exception\RuntimeException;
+use WikiMedia\RelevanceScoring\Application;
class OAuthProvider implements ControllerProviderInterface,
ServiceProviderInterface
{
diff --git a/src/RelevanceScoring/Application.php
b/src/RelevanceScoring/Application.php
new file mode 100644
index 0000000..18f1ac1
--- /dev/null
+++ b/src/RelevanceScoring/Application.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace WikiMedia\RelevanceScoring;
+
+class Application extends \Silex\Application
+{
+ use \Silex\Application\UrlGeneratorTrait;
+ use \Silex\Application\TwigTrait;
+}
diff --git a/src/RelevanceScoring/Controller/ImportController.php
b/src/RelevanceScoring/Controller/ImportController.php
index 77eb5ba..7f701e9 100644
--- a/src/RelevanceScoring/Controller/ImportController.php
+++ b/src/RelevanceScoring/Controller/ImportController.php
@@ -2,11 +2,11 @@
namespace WikiMedia\RelevanceScoring\Controller;
-use Application;
use Symfony\Component\Form\FormFactory;
use Symfony\Component\HttpFoundation\Request;
use Twig_Environment;
use WikiMedia\OAuth\User;
+use WikiMedia\RelevanceScoring\Application;
use WikiMedia\RelevanceScoring\Exception;
use WikiMedia\RelevanceScoring\Repository\QueriesRepository;
diff --git a/src/RelevanceScoring/Controller/QueriesController.php
b/src/RelevanceScoring/Controller/QueriesController.php
index b87986f..9f8952d 100644
--- a/src/RelevanceScoring/Controller/QueriesController.php
+++ b/src/RelevanceScoring/Controller/QueriesController.php
@@ -2,11 +2,11 @@
namespace WikiMedia\RelevanceScoring\Controller;
-use Application;
use Symfony\Component\Form\FormFactory;
use Symfony\Component\HttpFoundation\Request;
use Twig_Environment;
use WikiMedia\OAuth\User;
+use WikiMedia\RelevanceScoring\Application;
use WikiMedia\RelevanceScoring\Assert\MinimumSubmitted;
use WikiMedia\RelevanceScoring\Repository\QueriesRepository;
use WikiMedia\RelevanceScoring\Repository\ResultsRepository;
diff --git a/src/RelevanceScoring/Controller/ScoresController.php
b/src/RelevanceScoring/Controller/ScoresController.php
index d2538af..6c99229 100644
--- a/src/RelevanceScoring/Controller/ScoresController.php
+++ b/src/RelevanceScoring/Controller/ScoresController.php
@@ -2,10 +2,10 @@
namespace WikiMedia\RelevanceScoring\Controller;
-use Application;
use Twig_Environment;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use WikiMedia\RelevanceScoring\Application;
use WikiMedia\RelevanceScoring\Repository\ScoresRepository;
class ScoresController
diff --git a/src/RelevanceScoring/RelevanceScoringProvider.php
b/src/RelevanceScoring/RelevanceScoringProvider.php
index 9d13ba1..454b6bc 100644
--- a/src/RelevanceScoring/RelevanceScoringProvider.php
+++ b/src/RelevanceScoring/RelevanceScoringProvider.php
@@ -2,10 +2,10 @@
namespace WikiMedia\RelevanceScoring;
-use Application;
use Silex\ControllerCollection;
use Silex\ControllerProviderInterface;
use Silex\ServiceProviderInterface;
+use WikiMedia\RelevanceScoring\Application;
use WikiMedia\RelevanceScoring\Console\CacheClear;
use WikiMedia\RelevanceScoring\Console\Import;
use WikiMedia\RelevanceScoring\Console\ImportPending;
diff --git a/tests/unit/ApplicationTest.php b/tests/unit/ApplicationTest.php
index e3536b7..969a6b9 100644
--- a/tests/unit/ApplicationTest.php
+++ b/tests/unit/ApplicationTest.php
@@ -1,5 +1,7 @@
<?php
+use WikiMedia\RelevanceScoring\Application;
+
/**
* Created by PhpStorm.
* User: ebernhardson
@@ -37,4 +39,4 @@
{
$app[$serviceId];
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/287025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f9cda7537b88d36af0bf9b61db264697929e6a0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
