diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2016-01-20 16:24:48 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-22 21:12:11 +0100 |
commit | b0b893eafd3c1d66b8681a4a6420603af42ec084 (patch) | |
tree | c81cd3621747569d16e99dc47c726af2e668601a /src/Wallabag/CoreBundle | |
parent | 96fcb60c335a8985d0ebb8acec3af7c310edb70c (diff) | |
download | wallabag-b0b893eafd3c1d66b8681a4a6420603af42ec084.tar.gz wallabag-b0b893eafd3c1d66b8681a4a6420603af42ec084.tar.zst wallabag-b0b893eafd3c1d66b8681a4a6420603af42ec084.zip |
[#1604] First draft to fix SensioLabsInsight report
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r-- | src/Wallabag/CoreBundle/Command/InstallCommand.php | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | 5 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php (renamed from src/Wallabag/CoreBundle/Filter/EntryFilterType.php) | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 2 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/Wallabag/CoreBundle/Resources/views/themes/material/README.md | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | 0 |
10 files changed, 4 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index da099a19..63032dbb 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php | |||
@@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand | |||
64 | 64 | ||
65 | $fulfilled = true; | 65 | $fulfilled = true; |
66 | 66 | ||
67 | // @TODO: find a better way to check requirements | ||
68 | $label = '<comment>PCRE</comment>'; | 67 | $label = '<comment>PCRE</comment>'; |
69 | if (extension_loaded('pcre')) { | 68 | if (extension_loaded('pcre')) { |
70 | $status = '<info>OK!</info>'; | 69 | $status = '<info>OK!</info>'; |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3e1b512f..747976e3 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
9 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
11 | use Wallabag\CoreBundle\Entity\Entry; | 11 | use Wallabag\CoreBundle\Entity\Entry; |
12 | use Wallabag\CoreBundle\Filter\EntryFilterType; | 12 | use Wallabag\CoreBundle\Form\Type\EntryFilterType; |
13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; | 13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; |
14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; | 14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; |
15 | 15 | ||
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php index 0cb29881..2b1e1ef4 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | |||
@@ -16,11 +16,6 @@ class EditEntryType extends AbstractType | |||
16 | $builder | 16 | $builder |
17 | ->add('title', TextType::class, array('required' => true)) | 17 | ->add('title', TextType::class, array('required' => true)) |
18 | ->add('is_public', CheckboxType::class, array('required' => false)) | 18 | ->add('is_public', CheckboxType::class, array('required' => false)) |
19 | // @todo: add autocomplete | ||
20 | // ->add('tags', 'entity', array( | ||
21 | // 'class' => 'Wallabag\CoreBundle\Entity\Tag', | ||
22 | // 'choice_translation_domain' => true, | ||
23 | // )) | ||
24 | ->add('save', SubmitType::class) | 19 | ->add('save', SubmitType::class) |
25 | ; | 20 | ; |
26 | } | 21 | } |
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index c38be832..ee10bc8b 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -1,6 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Filter; | 3 | namespace Wallabag\CoreBundle\Form\Type; |
4 | 4 | ||
5 | use Doctrine\ORM\EntityRepository; | 5 | use Doctrine\ORM\EntityRepository; |
6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; | 6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 25d71cba..7d24d488 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -15,7 +15,7 @@ services: | |||
15 | - { name: form.type } | 15 | - { name: form.type } |
16 | 16 | ||
17 | wallabag_core.filter.type.entry: | 17 | wallabag_core.filter.type.entry: |
18 | class: Wallabag\CoreBundle\Filter\EntryFilterType | 18 | class: Wallabag\CoreBundle\Form\Type\EntryFilterType |
19 | arguments: | 19 | arguments: |
20 | - "@wallabag_core.entry_repository" | 20 | - "@wallabag_core.entry_repository" |
21 | - "@security.token_storage" | 21 | - "@security.token_storage" |
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css index d3f92926..62f2964c 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css | |||
@@ -564,7 +564,7 @@ img.preview { | |||
564 | height: 100%; | 564 | height: 100%; |
565 | width: 100%; | 565 | width: 100%; |
566 | margin: 0; | 566 | margin: 0; |
567 | margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */ | 567 | margin-top: -30% !important; |
568 | padding: 2em; | 568 | padding: 2em; |
569 | display: none; | 569 | display: none; |
570 | border-left: 1px #EEE solid; | 570 | border-left: 1px #EEE solid; |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md index 1f0054a4..1f0054a4 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 38f08da6..38f08da6 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md index 534eea30..534eea30 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index d6b8e28a..d6b8e28a 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | |||