oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Use ::class notation where possible

Browse source
This commit is contained in:
Yassine Guedidi 2022-09-01 20:54:56 +02:00
parent d1d56fbe25
commit 98af2e25f2
52 changed files with 347 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Wallabag/ApiBundle/Controller/UserRestController.php
View file

@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Translation\TranslatorInterface;
use Wallabag\ApiBundle\Entity\Client;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\NewUserType;
class UserRestController extends WallabagRestController
{
@ -63,7 +64,7 @@ class UserRestController extends WallabagRestController
// user will be disabled BY DEFAULT to avoid spamming account to be enabled
$user->setEnabled(false);
$form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user, [
$form = $this->createForm(NewUserType::class, $user, [
'csrf_protection' => false,
]);

3
src/Wallabag/ApiBundle/Form/Type/ClientType.php
View file

@ -9,6 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\ApiBundle\Entity\Client;
class ClientType extends AbstractType
{
@ -40,7 +41,7 @@ class ClientType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\ApiBundle\Entity\Client',
'data_class' => Client::class,
]);
}

5
src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php
View file

@ -11,6 +11,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
use Wallabag\CoreBundle\Form\Type\IgnoreOriginInstanceRuleType;
use Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository;
/**
@ -45,7 +46,7 @@ class IgnoreOriginInstanceRuleController extends Controller
{
$ignoreOriginInstanceRule = new IgnoreOriginInstanceRule();
$form = $this->createForm('Wallabag\CoreBundle\Form\Type\IgnoreOriginInstanceRuleType', $ignoreOriginInstanceRule);
$form = $this->createForm(IgnoreOriginInstanceRuleType::class, $ignoreOriginInstanceRule);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@ -77,7 +78,7 @@ class IgnoreOriginInstanceRuleController extends Controller
public function editAction(Request $request, IgnoreOriginInstanceRule $ignoreOriginInstanceRule)
{
$deleteForm = $this->createDeleteForm($ignoreOriginInstanceRule);
$editForm = $this->createForm('Wallabag\CoreBundle\Form\Type\IgnoreOriginInstanceRuleType', $ignoreOriginInstanceRule);
$editForm = $this->createForm(IgnoreOriginInstanceRuleType::class, $ignoreOriginInstanceRule);
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {

5
src/Wallabag/CoreBundle/Controller/SiteCredentialController.php
View file

@ -12,6 +12,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Form\Type\SiteCredentialType;
use Wallabag\CoreBundle\Helper\CryptoProxy;
use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
use Wallabag\UserBundle\Entity\User;
@ -52,7 +53,7 @@ class SiteCredentialController extends Controller
$credential = new SiteCredential($this->getUser());
$form = $this->createForm('Wallabag\CoreBundle\Form\Type\SiteCredentialType', $credential);
$form = $this->createForm(SiteCredentialType::class, $credential);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@ -91,7 +92,7 @@ class SiteCredentialController extends Controller
$this->checkUserAction($siteCredential);
$deleteForm = $this->createDeleteForm($siteCredential);
$editForm = $this->createForm('Wallabag\CoreBundle\Form\Type\SiteCredentialType', $siteCredential);
$editForm = $this->createForm(SiteCredentialType::class, $siteCredential);
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {

2
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View file

@ -77,7 +77,7 @@ class ConfigType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Config',
'data_class' => Config::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
View file

@ -8,6 +8,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\Entry;
class EditEntryType extends AbstractType
{
@ -39,7 +40,7 @@ class EditEntryType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Entry',
'data_class' => Entry::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/FeedType.php
View file

@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\Config;
class FeedType extends AbstractType
{
@ -25,7 +26,7 @@ class FeedType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Config',
'data_class' => Config::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/IgnoreOriginInstanceRuleType.php
View file

@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
class IgnoreOriginInstanceRuleType extends AbstractType
{
@ -26,7 +27,7 @@ class IgnoreOriginInstanceRuleType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule',
'data_class' => IgnoreOriginInstanceRule::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/IgnoreOriginUserRuleType.php
View file

@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
class IgnoreOriginUserRuleType extends AbstractType
{
@ -26,7 +27,7 @@ class IgnoreOriginUserRuleType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\IgnoreOriginUserRule',
'data_class' => IgnoreOriginUserRule::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
View file

@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\Entry;
class NewEntryType extends AbstractType
{
@ -23,7 +24,7 @@ class NewEntryType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Entry',
'data_class' => Entry::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/NewTagType.php
View file

@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\Tag;
class NewTagType extends AbstractType
{
@ -28,7 +29,7 @@ class NewTagType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Tag',
'data_class' => Tag::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/RenameTagType.php
View file

@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\Tag;
class RenameTagType extends AbstractType
{
@ -24,7 +25,7 @@ class RenameTagType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\Tag',
'data_class' => Tag::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/SiteCredentialType.php
View file

@ -8,6 +8,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\SiteCredential;
class SiteCredentialType extends AbstractType
{
@ -33,7 +34,7 @@ class SiteCredentialType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\SiteCredential',
'data_class' => SiteCredential::class,
]);
}

3
src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
View file

@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Entity\TaggingRule;
use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
class TaggingRuleType extends AbstractType
@ -35,7 +36,7 @@ class TaggingRuleType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\CoreBundle\Entity\TaggingRule',
'data_class' => TaggingRule::class,
]);
}

6
src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
View file

@ -2,6 +2,7 @@
namespace Wallabag\CoreBundle\Form\Type;
use FOS\UserBundle\Form\Type\RegistrationFormType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
@ -9,6 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\UserBundle\Entity\User;
class UserInformationType extends AbstractType
{
@ -40,13 +42,13 @@ class UserInformationType extends AbstractType
public function getParent()
{
return 'FOS\UserBundle\Form\Type\RegistrationFormType';
return RegistrationFormType::class;
}
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\UserBundle\Entity\User',
'data_class' => User::class,
]);
}

2
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View file

@ -162,7 +162,7 @@ class DownloadImages
switch ($ext) {
case 'gif':
// use Imagick if available to keep GIF animation
if (class_exists('\\Imagick')) {
if (class_exists(\Imagick::class)) {
try {
$imagick = new \Imagick();
$imagick->readImageBlob($res->getBody());

6
src/Wallabag/UserBundle/Controller/ManageController.php
View file

@ -18,7 +18,9 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Translation\TranslatorInterface;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\NewUserType;
use Wallabag\UserBundle\Form\SearchUserType;
use Wallabag\UserBundle\Form\UserType;
/**
* User controller.
@ -38,7 +40,7 @@ class ManageController extends Controller
// enable created user by default
$user->setEnabled(true);
$form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user);
$form = $this->createForm(NewUserType::class, $user);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@ -72,7 +74,7 @@ class ManageController extends Controller
$userManager = $this->container->get(UserManagerInterface::class);
$deleteForm = $this->createDeleteForm($user);
$form = $this->createForm('Wallabag\UserBundle\Form\UserType', $user);
$form = $this->createForm(UserType::class, $user);
$form->handleRequest($request);
// `googleTwoFactor` isn't a field within the User entity, we need to define it's value in a different way

3
src/Wallabag/UserBundle/Form/NewUserType.php
View file

@ -12,6 +12,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
use Wallabag\UserBundle\Entity\User;
class NewUserType extends AbstractType
{
@ -48,7 +49,7 @@ class NewUserType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\UserBundle\Entity\User',
'data_class' => User::class,
]);
}

3
src/Wallabag/UserBundle/Form/UserType.php
View file

@ -9,6 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\UserBundle\Entity\User;
class UserType extends AbstractType
{
@ -49,7 +50,7 @@ class UserType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => 'Wallabag\UserBundle\Entity\User',
'data_class' => User::class,
]);
}
}