PHP CS

CHANGELOG.md

@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added missing `swiftmailer` dependency
 
 ### Changed
+- Risky code change for PHP 7
 - Made `sonata-project/google-authenticator` an optional dependency
 - Moved public methods of `User` to `UserInterface`
 - Lowered upper composer dependencies

src/Admin/Document/GroupAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Admin/Document/UserAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Admin/Entity/GroupAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Admin/Entity/UserAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Admin/Model/GroupAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -39,7 +41,7 @@ public function getNewInstance()
     /**
      * {@inheritdoc}
      */
-    protected function configureListFields(ListMapper $listMapper)
+    protected function configureListFields(ListMapper $listMapper): void
     {
         $listMapper
             ->addIdentifier('name')
@@ -50,7 +52,7 @@ protected function configureListFields(ListMapper $listMapper)
     /**
      * {@inheritdoc}
      */
-    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void
     {
         $datagridMapper
             ->add('name')
@@ -60,7 +62,7 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     /**
      * {@inheritdoc}
      */
-    protected function configureFormFields(FormMapper $formMapper)
+    protected function configureFormFields(FormMapper $formMapper): void
     {
         $formMapper
             ->tab('Group')

src/Admin/Model/UserAdmin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -64,7 +66,7 @@ public function getExportFields()
     /**
      * {@inheritdoc}
      */
-    public function preUpdate($user)
+    public function preUpdate($user): void
     {
         $this->getUserManager()->updateCanonicalFields($user);
         $this->getUserManager()->updatePassword($user);
@@ -73,7 +75,7 @@ public function preUpdate($user)
     /**
      * @param UserManagerInterface $userManager
      */
-    public function setUserManager(UserManagerInterface $userManager)
+    public function setUserManager(UserManagerInterface $userManager): void
     {
         $this->userManager = $userManager;
     }
@@ -89,7 +91,7 @@ public function getUserManager()
     /**
      * {@inheritdoc}
      */
-    protected function configureListFields(ListMapper $listMapper)
+    protected function configureListFields(ListMapper $listMapper): void
     {
         $listMapper
             ->addIdentifier('username')
@@ -109,7 +111,7 @@ protected function configureListFields(ListMapper $listMapper)
     /**
      * {@inheritdoc}
      */
-    protected function configureDatagridFilters(DatagridMapper $filterMapper)
+    protected function configureDatagridFilters(DatagridMapper $filterMapper): void
     {
         $filterMapper
             ->add('id')
@@ -122,7 +124,7 @@ protected function configureDatagridFilters(DatagridMapper $filterMapper)
     /**
      * {@inheritdoc}
      */
-    protected function configureShowFields(ShowMapper $showMapper)
+    protected function configureShowFields(ShowMapper $showMapper): void
     {
         $showMapper
             ->with('General')
@@ -161,7 +163,7 @@ protected function configureShowFields(ShowMapper $showMapper)
     /**
      * {@inheritdoc}
      */
-    protected function configureFormFields(FormMapper $formMapper)
+    protected function configureFormFields(FormMapper $formMapper): void
     {
         // define group zoning
         $formMapper

src/Command/TwoStepVerificationCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -22,7 +24,7 @@ class TwoStepVerificationCommand extends ContainerAwareCommand
     /**
      * {@inheritdoc}
      */
-    public function configure()
+    public function configure(): void
     {
         $this->setName('sonata:user:two-step-verification');
         $this->addArgument('username', InputArgument::REQUIRED, 'The username to protect with a two step verification process');
@@ -33,7 +35,7 @@ public function configure()
     /**
      * {@inheritdoc}
      */
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): void
     {
         if (!$this->getContainer()->has('sonata.user.google.authenticator.provider')) {
             throw new \RuntimeException('Two Step Verification process is not enabled');

src/Controller/AdminResettingController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -173,7 +175,7 @@ public function resetAction(Request $request, $token)
      *
      * @param UserInterface $user
      */
-    private function sendResettingEmailMessage(UserInterface $user)
+    private function sendResettingEmailMessage(UserInterface $user): void
     {
         $url = $this->generateUrl('sonata_user_admin_resetting_reset', [
             'token' => $user->getConfirmationToken(),

src/Controller/AdminSecurityController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -73,12 +75,12 @@ public function loginAction(Request $request)
         ]);
     }
 
-    public function checkAction()
+    public function checkAction(): void
     {
         throw new \RuntimeException('You must configure the check path to be handled by the firewall using form_login in your security firewall configuration.');
     }
 
-    public function logoutAction()
+    public function logoutAction(): void
     {
         throw new \RuntimeException('You must activate the logout in your security firewall configuration.');
     }

src/Controller/Api/GroupController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Controller/Api/UserController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/DependencyInjection/Compiler/GlobalVariablesCompilerPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -25,7 +27,7 @@ class GlobalVariablesCompilerPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $container->getDefinition('twig')
             ->addMethodCall('addGlobal', ['sonata_user', new Reference('sonata.user.twig.global')]);

src/DependencyInjection/Configuration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/DependencyInjection/SonataUserExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -31,7 +33,7 @@ class SonataUserExtension extends Extension implements PrependExtensionInterface
     /**
      * {@inheritdoc}
      */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         if ($container->hasExtension('twig')) {
             // add custom form widgets
@@ -42,7 +44,7 @@ public function prepend(ContainerBuilder $container)
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = new Configuration();
@@ -165,7 +167,7 @@ public function configureGoogleAuthenticator($config, ContainerBuilder $containe
      * @param array            $config
      * @param ContainerBuilder $container
      */
-    public function configureClass($config, ContainerBuilder $container)
+    public function configureClass($config, ContainerBuilder $container): void
     {
         if ('orm' === $config['manager_type']) {
             $modelType = 'entity';
@@ -183,7 +185,7 @@ public function configureClass($config, ContainerBuilder $container)
      * @param array            $config
      * @param ContainerBuilder $container
      */
-    public function configureAdminClass($config, ContainerBuilder $container)
+    public function configureAdminClass($config, ContainerBuilder $container): void
     {
         $container->setParameter('sonata.user.admin.user.class', $config['admin']['user']['class']);
         $container->setParameter('sonata.user.admin.group.class', $config['admin']['group']['class']);
@@ -193,7 +195,7 @@ public function configureAdminClass($config, ContainerBuilder $container)
      * @param array            $config
      * @param ContainerBuilder $container
      */
-    public function configureTranslationDomain($config, ContainerBuilder $container)
+    public function configureTranslationDomain($config, ContainerBuilder $container): void
     {
         $container->setParameter('sonata.user.admin.user.translation_domain', $config['admin']['user']['translation']);
         $container->setParameter('sonata.user.admin.group.translation_domain', $config['admin']['group']['translation']);
@@ -203,7 +205,7 @@ public function configureTranslationDomain($config, ContainerBuilder $container)
      * @param array            $config
      * @param ContainerBuilder $container
      */
-    public function configureController($config, ContainerBuilder $container)
+    public function configureController($config, ContainerBuilder $container): void
     {
         $container->setParameter('sonata.user.admin.user.controller', $config['admin']['user']['controller']);
         $container->setParameter('sonata.user.admin.group.controller', $config['admin']['group']['controller']);
@@ -212,7 +214,7 @@ public function configureController($config, ContainerBuilder $container)
     /**
      * @param array $config
      */
-    public function registerDoctrineMapping(array $config)
+    public function registerDoctrineMapping(array $config): void
     {
         foreach ($config['class'] as $type => $class) {
             if (!class_exists($class)) {
@@ -250,7 +252,7 @@ public function registerDoctrineMapping(array $config)
      * @param ContainerBuilder $container
      * @param                  $managerType
      */
-    protected function aliasManagers(ContainerBuilder $container, $managerType)
+    protected function aliasManagers(ContainerBuilder $container, $managerType): void
     {
         $container->setAlias('sonata.user.user_manager', sprintf('sonata.user.%s.user_manager', $managerType));
         $container->setAlias('sonata.user.group_manager', sprintf('sonata.user.%s.group_manager', $managerType));
@@ -259,7 +261,7 @@ protected function aliasManagers(ContainerBuilder $container, $managerType)
     /**
      * @param array $config
      */
-    private function checkManagerTypeToModelTypeMapping(array $config)
+    private function checkManagerTypeToModelTypeMapping(array $config): void
     {
         $managerType = $config['manager_type'];
 

src/Document/BaseGroup.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

src/Document/BaseUser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -22,7 +24,7 @@ class BaseUser extends AbstractedUser implements UserInterface
     /**
      * Hook on pre-persist operations.
      */
-    public function prePersist()
+    public function prePersist(): void
     {
         $this->createdAt = new \DateTime();
         $this->updatedAt = new \DateTime();
@@ -31,7 +33,7 @@ public function prePersist()
     /**
      * Hook on pre-update operations.
      */
-    public function preUpdate()
+    public function preUpdate(): void
     {
         $this->updatedAt = new \DateTime();
     }

src/Document/GroupManager.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -30,7 +32,7 @@ public function findGroupsBy(array $criteria = null, array $orderBy = null, $lim
     /**
      * {@inheritdoc}
      */
-    public function getPager(array $criteria, $page, $limit = 10, array $sort = [])
+    public function getPager(array $criteria, $page, $limit = 10, array $sort = []): void
     {
         new \RuntimeException('method not implemented');
     }