]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Jump to Symfony 3.1
authorJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 1 Jun 2016 19:27:35 +0000 (21:27 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 22 Jun 2016 15:59:35 +0000 (17:59 +0200)
53 files changed:
.travis.yml
app/config/config.yml
app/config/config_dev.yml
app/config/config_prod.yml
bin/phpunit [deleted symlink]
composer.json
phpunit.xml.dist
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php [moved from src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php with 97% similarity]
tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php [moved from src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php with 97% similarity]
tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php [moved from src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php with 99% similarity]
tests/Wallabag/ApiBundle/WallabagApiTestCase.php [moved from src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php with 97% similarity]
tests/Wallabag/CoreBundle/Command/InstallCommandTest.php [moved from src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php with 98% similarity]
tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php [moved from src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php with 94% similarity]
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php with 95% similarity]
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php with 98% similarity]
tests/Wallabag/CoreBundle/Controller/RssControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php with 97% similarity]
tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php with 95% similarity]
tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php with 88% similarity]
tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php with 84% similarity]
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php [moved from src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php with 97% similarity]
tests/Wallabag/CoreBundle/EventListener/LocaleListenerTest.php [moved from src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php with 98% similarity]
tests/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListenerTest.php [moved from src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php with 97% similarity]
tests/Wallabag/CoreBundle/EventListener/UserLocaleListenerTest.php [moved from src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php with 97% similarity]
tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php [moved from src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php with 96% similarity]
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php [moved from src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Helper/RedirectTest.php [moved from src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php with 96% similarity]
tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php [moved from src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Mock/InstallCommandMock.php [moved from src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php with 92% similarity]
tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php [moved from src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriberTest.php [moved from src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php with 99% similarity]
tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php [moved from src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php with 91% similarity]
tests/Wallabag/CoreBundle/WallabagCoreTestCase.php [moved from src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php with 96% similarity]
tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php [moved from src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php with 87% similarity]
tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php [moved from src/Wallabag/ImportBundle/Tests/Controller/PocketControllerTest.php with 95% similarity]
tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php [moved from src/Wallabag/ImportBundle/Tests/Controller/WallabagV1ControllerTest.php with 97% similarity]
tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php [moved from src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php with 97% similarity]
tests/Wallabag/ImportBundle/Import/ImportChainTest.php [moved from src/Wallabag/ImportBundle/Tests/Import/ImportChainTest.php with 92% similarity]
tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php [moved from src/Wallabag/ImportBundle/Tests/Import/ImportCompilerPassTest.php with 96% similarity]
tests/Wallabag/ImportBundle/Import/PocketImportTest.php [moved from src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php with 99% similarity]
tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php [moved from src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php with 99% similarity]
tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php [moved from src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php with 99% similarity]
tests/Wallabag/ImportBundle/fixtures/test.html [moved from src/Wallabag/ImportBundle/Tests/fixtures/test.html with 100% similarity]
tests/Wallabag/ImportBundle/fixtures/test.txt [moved from src/Wallabag/ImportBundle/Tests/fixtures/test.txt with 100% similarity]
tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json [moved from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1-read.json with 100% similarity]
tests/Wallabag/ImportBundle/fixtures/wallabag-v1.json [moved from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1.json with 100% similarity]
tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json [moved from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2-read.json with 100% similarity]
tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json [moved from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2.json with 100% similarity]
tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php [moved from src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php with 98% similarity]
web/app.php

index d397c872d07fa8c6ca2be8f4e7e922e41801a453..7fe15c5f7b64a3f1b269cefdf8996a5561b05be2 100644 (file)
@@ -55,6 +55,6 @@ before_install:
 script:
     - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
     - ant prepare-$DB
-    - bin/phpunit -v
+    - phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
     - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
index ea028d855705c3d263d1fd0fb46b2d4af68ba6ea..9e2e08a67fae9365c67b177761dc157e6743a5f1 100644 (file)
@@ -169,7 +169,7 @@ liip_theme:
 
     path_patterns:
         bundle_resource:
-            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+            - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
 
 fos_user:
     db_driver: orm
@@ -177,9 +177,9 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: %fosuser_confirmation%
+            enabled: "%fosuser_confirmation%"
     from_email:
-        address:        %from_email%
+        address:        "%from_email%"
         sender_name:    wallabag
 fos_oauth_server:
     db_driver:           orm
@@ -197,8 +197,8 @@ scheb_two_factor:
         cookie_lifetime: 2592000
 
     email:
-        enabled: %twofactor_auth%
-        sender_email: %twofactor_sender%
+        enabled: "%twofactor_auth%"
+        sender_email: "%twofactor_sender%"
         digits: 6
         template: WallabagUserBundle:Authentication:form.html.twig
         mailer: wallabag_user.auth_code_mailer
index 2813e369db685f2b132ed2279b7d243c5f168548..ec23babb8f6b4c7fc36a18e3a27122f98042cf55 100644 (file)
@@ -17,14 +17,14 @@ monolog:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
-            channels: [!event]
+            channels: ['!event']
         console:
             type:   console
             bubble: false
             verbosity_levels:
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: [!event, !doctrine]
+            channels: ['!event', '!doctrine']
         console_very_verbose:
             type:   console
             bubble: false
index 342837a03137f7f2d10763f5ce9003b8d9154108..65b040ccef91420386eee74d097791774f1644f8 100644 (file)
@@ -2,8 +2,8 @@ imports:
     - { resource: config.yml }
 
 #framework:
-#    validation:
-#        cache: apc
+#    cache:
+#        system: cache.adapter.apcu
 
 #doctrine:
 #    orm:
diff --git a/bin/phpunit b/bin/phpunit
deleted file mode 120000 (symlink)
index 4ba3256..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/phpunit/phpunit/phpunit
\ No newline at end of file
index c4edd3c2e9bf2450571eb3770a8a4473d2aaee34..90f3fd1de3d10db71117e3be5bcfa83ee0151397 100644 (file)
@@ -43,7 +43,7 @@
         "ext-iconv": "*",
         "ext-tokenizer": "*",
         "ext-pdo": "*",
-        "symfony/symfony": "3.0.*",
+        "symfony/symfony": "3.1.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
@@ -87,7 +87,7 @@
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "^2.7",
+        "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9"
     },
     "scripts": {
         "psr-4": { "Wallabag\\": "src/Wallabag/" },
         "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "Tests\\": "tests/" }
+    },
     "config": {
         "bin-dir": "bin"
     },
index e68df9de6fb5e19ad0464a2a438fe8f0f620f442..38880908022eb921527da71c842377db5ef12997 100644 (file)
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="app/autoload.php"
-        >
+>
 
     <testsuites>
         <testsuite name="wallabag Test Suite">
-            <directory>src/Wallabag/*Bundle/Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
     <php>
+        <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="app/" />
     </php>
 
index 4cf22200fa753ba06ab113505fe5fa7e77a59d51..74c53bf058d3825e39b0efdb005b6c0807622eb4 100644 (file)
@@ -32,7 +32,6 @@ class ConfigType extends AbstractType
         $builder
             ->add('theme', ChoiceType::class, [
                 'choices' => array_flip($this->themes),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.theme_label',
             ])
             ->add('items_per_page', null, [
@@ -49,7 +48,6 @@ class ConfigType extends AbstractType
             ])
             ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.language_label',
             ])
             ->add('save', SubmitType::class, [
index f3f848e9a6db0f667e5e80a0e9b308192a1dfc86..bc59c9a1461ac86bb095246b78d1637fa671bf9f 100644 (file)
@@ -113,7 +113,6 @@ class EntryFilterType extends AbstractType
             ])
             ->add('language', ChoiceFilterType::class, [
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
-                'choices_as_values' => true,
                 'label' => 'entry.filters.language_label',
             ])
         ;
similarity index 97%
rename from src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
rename to tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
index 3eba719384a7c690aca3405c301ded906deee214..70849f74129000ca787a0a414396feb478516f81 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Tests\Controller;
+namespace Tests\AnnotationBundle\Controller;
 
-use Wallabag\AnnotationBundle\Tests\WallabagAnnotationTestCase;
+use Tests\Wallabag\AnnotationBundle\WallabagAnnotationTestCase;
 
 class AnnotationControllerTest extends WallabagAnnotationTestCase
 {
similarity index 97%
rename from src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
rename to tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
index a9035accfbf6c36de66ca309f5e9af6715c320b9..82790a5c43c350d7bca672d3a19380b85b525421 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Tests;
+namespace Tests\Wallabag\AnnotationBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
similarity index 99%
rename from src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
rename to tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
index c50e4d027c0b386d49ea9a8e9ac841e0d80a3416..c39cc357763e706a3da6364c53aecfd2421c5c53 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ApiBundle\Tests\Controller;
+namespace Tests\Wallabag\ApiBundle\Controller;
 
-use Wallabag\ApiBundle\Tests\WallabagApiTestCase;
+use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class WallabagRestControllerTest extends WallabagApiTestCase
 {
similarity index 97%
rename from src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php
rename to tests/Wallabag/ApiBundle/WallabagApiTestCase.php
index 13d72d2c4bf20a5a0781fff54a0a5d57ce07715a..cf9b33471cb2d13fa36251378e4d9ce109ea7ca9 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Tests;
+namespace Tests\Wallabag\ApiBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
similarity index 98%
rename from src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
rename to tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
index 0673d58178efe99f08c201121a5b3d36568823a2..6c6ce0873ff40ee73f85146243e7ccbd6603c673 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
 use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
@@ -9,8 +9,8 @@ use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Tester\CommandTester;
 use Wallabag\CoreBundle\Command\InstallCommand;
-use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\Mock\InstallCommandMock;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class InstallCommandTest extends WallabagCoreTestCase
 {
similarity index 94%
rename from src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php
rename to tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php
index 4f544c1d2cabc31709eeea6ffaca6ee74436aef4..ec31708f93d1240ccd5332317b67abb4b2f5efd6 100644 (file)
@@ -1,11 +1,11 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Wallabag\CoreBundle\Command\TagAllCommand;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class TagAllCommandTest extends WallabagCoreTestCase
 {
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 8cdedfda38bdf66bf6c47cb8f76a78de55830afb..7193f9b0e4331976f2768557425af73ec36faa2a 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ConfigControllerTest extends WallabagCoreTestCase
 {
similarity index 95%
rename from src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php
index fc220b850d25d487ca5bd332a8b44645e41249c6..79452ace4a6078d10bd11bf95f99d17c7020559c 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class DeveloperControllerTest extends WallabagCoreTestCase
 {
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 5ce893c14fef9073b129d6e9b6da25931b3068ff..bea771bcabda6bd133cd12d143987b179bdd5cae 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 
 class EntryControllerTest extends WallabagCoreTestCase
similarity index 98%
rename from src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
index 76c98055786eec117ccc250d869099b6da761523..b22156c37466c1012d0947dac652de3244c358b7 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ExportControllerTest extends WallabagCoreTestCase
 {
similarity index 97%
rename from src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
index 87a01b8e468e6e5513eaa9e26d487c1be1f4b5c1..fb6fe06a60e039400d7be97910c685ddd47d055c 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class RssControllerTest extends WallabagCoreTestCase
 {
similarity index 95%
rename from src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
index 2910fa4f739a27ab1347b577de28ffc518935b8c..f503ff4bd8daff2bd2d64209d643d2d0e231d410 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class SecurityControllerTest extends WallabagCoreTestCase
 {
similarity index 88%
rename from src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php
index fd698b3e491a389b71b63f28a00cde559e9d5e1e..9b8b57027aa6f9e2e0556af343e514f6d8848218 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 /**
  * The controller `SettingsController` does not exist.
similarity index 84%
rename from src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php
index 6d7976c43cc53129e9aeece4fa1420aa7d31bed8..98a37b500a32d8fd3d31df050d08fe29d13fc2db 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class StaticControllerTest extends WallabagCoreTestCase
 {
similarity index 97%
rename from src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 8af37ea441a57278cfbffb9bac7951858be2a25b..a019d36c98c24cfb20882cd4d0e0f7e8f010fe81 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class TagControllerTest extends WallabagCoreTestCase
 {
similarity index 98%
rename from src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
rename to tests/Wallabag/CoreBundle/EventListener/LocaleListenerTest.php
index b4c022d53647c7de0b7b84e677ab34553560591a..2a7f939067fb0a8ca7e0b84f8829c921a47c47e4 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
similarity index 97%
rename from src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
rename to tests/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListenerTest.php
index 7039dc6192d90af2fbf7cfb92baefcf8921f864d..e45722fa78565ecf04fc8071fa3229d8d78e76ce 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\FOSUserEvents;
similarity index 97%
rename from src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
rename to tests/Wallabag/CoreBundle/EventListener/UserLocaleListenerTest.php
index d9ffe30ef207e70eba98987066f10e8dcee4f1fb..e9ac7c1dfcdbec8448b81e8222c8ced62b8093d2 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
similarity index 96%
rename from src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php
rename to tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php
index 6b1e8613833dca1167c411c149bfc6d9f29c6ace..0ec98c1fbf3b471df5b5c348745856442b9399c9 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Form\DataTransformer;
+namespace Tests\Wallabag\CoreBundle\Form\DataTransformer;
 
 use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
 
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
rename to tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 9d7b0f3680924a232ebf6880232178e3033f0d14..7abb0737894bf6f4116dcaed468b2cc526302c44 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Psr\Log\NullLogger;
 use Wallabag\CoreBundle\Helper\ContentProxy;
similarity index 96%
rename from src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
rename to tests/Wallabag/CoreBundle/Helper/RedirectTest.php
index f4aecc8048fa5ad4a8fc357793f5378626671e18..f339f75e80f07fe65f9768a6525602e467799102 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Wallabag\CoreBundle\Helper\Redirect;
 
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
rename to tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php
index e9025b450df58b16b1cf97010ae561e0ef96cdce..17b08c2ac7cbe9f9b2138c894bae476c8a57791b 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\Entry;
similarity index 92%
rename from src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php
rename to tests/Wallabag/CoreBundle/Mock/InstallCommandMock.php
index ff9cdafd998c5ffa919c03460083e52444706198..5806bd4d5dc9b7a8329fa9760d3dfd7097305c75 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Mock;
+namespace Tests\Wallabag\CoreBundle\Mock;
 
 use Wallabag\CoreBundle\Command\InstallCommand;
 
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
rename to tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php
index ee10938a92b46cc13582962f36f3154522068fa3..e29b58b5795c35f3e29d4c56cf854f00f2af541e 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
similarity index 99%
rename from src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
rename to tests/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriberTest.php
index e5eafab1a4f3f8d3f9cef42163680434f87fedae..4ae76703320b78838c71c35a6cf27a70e4fe28db 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Subscriber;
+namespace Tests\Wallabag\CoreBundle\Subscriber;
 
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
similarity index 91%
rename from src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
rename to tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
index 9af8fad8f26d544f2d8687f28b782f10bd51983b..8ec2a75a228b1c202117525e7353f152dd1b1a50 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Twig;
+namespace Tests\Wallabag\CoreBundle\Twig;
 
 use Wallabag\CoreBundle\Twig\WallabagExtension;
 
similarity index 96%
rename from src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
rename to tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 05450c0b987ac7d86a0799213bfa555cb824e282..c69e83301203ec577c9eb23577afaa8e09a8adbc 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests;
+namespace Tests\Wallabag\CoreBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
similarity index 87%
rename from src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php
rename to tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
index 9f38fa8287ab043f83a5bd3a5bd7defad5fc46ab..96b5300ba3531c3378841d7544943871898fe99d 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ImportControllerTest extends WallabagCoreTestCase
 {
similarity index 95%
rename from src/Wallabag/ImportBundle/Tests/Controller/PocketControllerTest.php
rename to tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
index 403fe9b0d603b5d859aaea4c410d986e1fd10062..6aaf1b57be7a1d00ef2ea0600b2ebbb82a217c51 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class PocketControllerTest extends WallabagCoreTestCase
 {
similarity index 97%
rename from src/Wallabag/ImportBundle/Tests/Controller/WallabagV1ControllerTest.php
rename to tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
index f7de3fef61a43dce3fdc07aebcbc56f3cc38d556..c1025b41c4a51a180ee7432ac15489797d0c303f 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class WallabagV1ControllerTest extends WallabagCoreTestCase
similarity index 97%
rename from src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php
rename to tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
index 15251ae7ba115d322c97c03a8d61aa6bcf81946e..d8d2c8bf60267d34fd9119492e5ec668a85c4b0f 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class WallabagV2ControllerTest extends WallabagCoreTestCase
similarity index 92%
rename from src/Wallabag/ImportBundle/Tests/Import/ImportChainTest.php
rename to tests/Wallabag/ImportBundle/Import/ImportChainTest.php
index 702d2a9b9c496f8327553e7a984bfc3bd4440bc9..32568ce53a0b9bd7391ec32f6e5be65cc6773a1d 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\ImportChain;
 
similarity index 96%
rename from src/Wallabag/ImportBundle/Tests/Import/ImportCompilerPassTest.php
rename to tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php
index b22fcfbc1ce89c446689afdbeb8c5cab60802f14..71a007a9c7c742614477fc5f9268be497efa25eb 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Wallabag\ImportBundle\Import\ImportCompilerPass;
similarity index 99%
rename from src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
rename to tests/Wallabag/ImportBundle/Import/PocketImportTest.php
index cb1715724547e3f250595a89d255567d61e8f68e..41f9b51f2bd4108438d341ac5aa036d3b4eaacb6 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\CoreBundle\Entity\Entry;
similarity index 99%
rename from src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
rename to tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
index 8c967e1ba06b297acfa32ef216a5d3cc8482ff4e..bdc47dac14227b631e8e685b6d9f460000537336 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\WallabagV1Import;
 use Wallabag\UserBundle\Entity\User;
similarity index 99%
rename from src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
rename to tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
index e287d8e20ea01fb3eb97c9e61c677c1dd4e12568..8ec66b12e41672b4d7e223217d8231b550386a5f 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\WallabagV2Import;
 use Wallabag\UserBundle\Entity\User;
similarity index 98%
rename from src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php
rename to tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index 00967051b25e1b9df8973201d7c6888a10e1be23..f670c92582d7b0931dc6e890f17d415211f9183b 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Tests\Mailer;
+namespace Tests\Wallabag\UserBundle\Mailer;
 
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\UserBundle\Mailer\AuthCodeMailer;
index 5c5ee03be180d6fbf52634d103154661f7b22903..4c2c4650e167688724cd7e79b1735b80c2a8de96 100644 (file)
@@ -8,16 +8,6 @@ use Symfony\Component\HttpFoundation\Request;
 $loader = require __DIR__.'/../app/autoload.php';
 include_once __DIR__.'/../var/bootstrap.php.cache';
 
-// Enable APC for autoloading to improve performance.
-// You should change the ApcClassLoader first argument to a unique prefix
-// in order to prevent cache key conflicts with other applications
-// also using APC.
-/*
-$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
-$loader->unregister();
-$apcLoader->register(true);
-*/
-
 $kernel = new AppKernel('prod', false);
 $kernel->loadClassCache();
 //$kernel = new AppCache($kernel);