Skip to content

Commit

Permalink
PHPUnit forward compatibility layer :)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarioBlazek
MarioBlazek committed Feb 9, 2017
1 parent c5efd86 commit f0d5e5f
Show file tree
Hide file tree
Showing 17 changed files with 63 additions and 69 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -8,4 +8,5 @@ composer.lock
phpunit.phar
.php_cs.cache
phpunit.xml
coverage.xml
build/
6 changes: 3 additions & 3 deletions composer.json
View file
Expand Up @@ -22,11 +22,11 @@
"netgen/ez-forms-bundle": "^1.2.0"
},
"require-dev": {
"phpunit/phpunit": "~5.0",
"phpunit/phpunit": "^5.7 <6.0",
"swiftmailer/swiftmailer": "*",
"doctrine/orm": "*",
"matthiasnoback/symfony-config-test": "*",
"matthiasnoback/symfony-dependency-injection-test": "*",
"matthiasnoback/symfony-config-test": "~2.0",
"matthiasnoback/symfony-dependency-injection-test": "~1.0",
"squizlabs/php_codesniffer": "^2.3"
},
"autoload": {
Expand Down
11 changes: 5 additions & 6 deletions tests/Action/ActionRegistryTest.php
View file
Expand Up @@ -8,11 +8,10 @@
use Netgen\Bundle\InformationCollectionBundle\Action\ActionRegistry;
use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
use Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;

class ActionRegistryTest extends PHPUnit_Framework_TestCase
class ActionRegistryTest extends TestCase
{
/**
* @var ActionRegistry
Expand Down Expand Up @@ -45,17 +44,17 @@ class ActionRegistryTest extends PHPUnit_Framework_TestCase
protected $emptyConfig;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $action1;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $action2;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $logger;

Expand Down
17 changes: 8 additions & 9 deletions tests/Action/DatabaseActionTest.php
View file
Expand Up @@ -24,43 +24,42 @@
use eZ\Publish\Core\FieldType\TextLine\Value as TextLineValue;
use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
use Netgen\Bundle\InformationCollectionBundle\Value\LegacyData;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;

class DatabaseActionTest extends PHPUnit_Framework_TestCase
class DatabaseActionTest extends TestCase
{
/**
* @var DatabaseAction
*/
protected $action;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $factory;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $repository;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $secondRepository;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $ezRepository;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentType;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentService;

Expand Down
17 changes: 8 additions & 9 deletions tests/Action/EmailActionTest.php
View file
Expand Up @@ -13,45 +13,44 @@
use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
use Swift_Mailer;

class EmailActionTest extends PHPUnit_Framework_TestCase
class EmailActionTest extends TestCase
{
/**
* @var EmailAction
*/
protected $action;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $factory;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $template;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentService;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $mailer;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentType;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $emailData;

Expand Down
17 changes: 8 additions & 9 deletions tests/Controller/InformationCollectionControllerTest.php
View file
Expand Up @@ -7,46 +7,45 @@
use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
use Netgen\Bundle\InformationCollectionBundle\Controller\InformationCollectionController;
use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Form;
use Symfony\Component\HttpFoundation\Request;

class InformationCollectionControllerTest extends PHPUnit_Framework_TestCase
class InformationCollectionControllerTest extends TestCase
{
/**
* @var InformationCollectionController
*/
protected $controller;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $dispatcher;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $builder;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentView;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $request;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $formBuilder;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $form;

Expand Down
4 changes: 2 additions & 2 deletions tests/DependencyInjection/ConfigurationTest.php
View file
Expand Up @@ -3,10 +3,10 @@
namespace Netgen\Bundle\InformationCollectionBundle\Tests\DependencyInjection;

use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Netgen\Bundle\InformationCollectionBundle\DependencyInjection\Configuration;

class ConfigurationTest extends PHPUnit_Framework_TestCase
class ConfigurationTest extends TestCase
{
use ConfigurationTestCaseTrait;

Expand Down
4 changes: 2 additions & 2 deletions tests/Entity/EzInfoCollectionAttributeTest.php
View file
Expand Up @@ -3,9 +3,9 @@
namespace Netgen\Bundle\InformationCollectionBundle\Tests\Entity;

use Netgen\Bundle\InformationCollectionBundle\Entity\EzInfoCollectionAttribute;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class EzInfoCollectionAttributeTest extends PHPUnit_Framework_TestCase
class EzInfoCollectionAttributeTest extends TestCase
{
/**
* @var EzInfoCollectionAttribute
Expand Down
4 changes: 2 additions & 2 deletions tests/Entity/EzInfoCollectionTest.php
View file
Expand Up @@ -3,9 +3,9 @@
namespace Netgen\Bundle\InformationCollectionBundle\Tests\Entity;

use Netgen\Bundle\InformationCollectionBundle\Entity\EzInfoCollection;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class EzInfoCollectionTest extends PHPUnit_Framework_TestCase
class EzInfoCollectionTest extends TestCase
{
/**
* @var EzInfoCollection
Expand Down
4 changes: 2 additions & 2 deletions tests/Event/InformationCollectedTest.php
View file
Expand Up @@ -4,9 +4,9 @@

use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class InformationCollectedTest extends PHPUnit_Framework_TestCase
class InformationCollectedTest extends TestCase
{
/**
* @var InformationCollected
Expand Down
11 changes: 5 additions & 6 deletions tests/Factory/EmailDataFactoryTest.php
View file
Expand Up @@ -14,10 +14,9 @@
use eZ\Publish\Core\Helper\FieldHelper;
use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;

class EmailDataFactoryTest extends PHPUnit_Framework_TestCase
class EmailDataFactoryTest extends TestCase
{
/**
* @var EmailDataFactory
Expand All @@ -30,17 +29,17 @@ class EmailDataFactoryTest extends PHPUnit_Framework_TestCase
protected $config;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $translationHelper;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $fieldHelper;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentTypeService;

Expand Down
7 changes: 3 additions & 4 deletions tests/Factory/FieldDataFactoryTest.php
View file
Expand Up @@ -7,18 +7,17 @@
use Netgen\Bundle\InformationCollectionBundle\FieldHandler\FieldHandlerRegistry;
use eZ\Publish\Core\FieldType\TextLine\Value as TextValue;
use Netgen\Bundle\InformationCollectionBundle\Value\LegacyData;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;

class FieldDataFactoryTest extends PHPUnit_Framework_TestCase
class FieldDataFactoryTest extends TestCase
{
/**
* @var FieldDataFactory
*/
protected $factory;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $registry;

Expand Down
4 changes: 2 additions & 2 deletions tests/FieldHandler/FieldHandlerRegistryTest.php
View file
Expand Up @@ -5,9 +5,9 @@
use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomFieldHandlerInterface;
use Netgen\Bundle\InformationCollectionBundle\FieldHandler\FieldHandlerRegistry;
use eZ\Publish\Core\FieldType\Integer\Value as TestValue;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class FieldHandlerRegistryTest extends PHPUnit_Framework_TestCase
class FieldHandlerRegistryTest extends TestCase
{
/**
* @var FieldHandlerRegistry
Expand Down
13 changes: 6 additions & 7 deletions tests/Form/Builder/FormBuilderTest.php
View file
Expand Up @@ -6,36 +6,35 @@
use eZ\Publish\Core\Repository\ContentTypeService;
use eZ\Publish\Core\Repository\Values\Content\Location;
use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
use PHPUnit_Framework_TestCase;
use PHPUnit_Framework_MockObject_MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\FormFactory;
use Symfony\Component\Routing\Router;
use Symfony\Component\Form\FormBuilder as SymfonyFormBuilder;

class FormBuilderTest extends PHPUnit_Framework_TestCase
class FormBuilderTest extends TestCase
{
/**
* @var FormBuilder
*/
protected $formBuilder;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $formFactory;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $contentTypeService;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $router;

/**
* @var PHPUnit_Framework_MockObject_MockObject
* @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $innerFormBuilder;

Expand Down
4 changes: 2 additions & 2 deletions tests/Listener/InformationCollectedListenerTest.php
View file
Expand Up @@ -7,9 +7,9 @@
use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
use Netgen\Bundle\InformationCollectionBundle\Events;
use Netgen\Bundle\InformationCollectionBundle\Listener\InformationCollectedListener;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class InformationCollectedListenerTest extends PHPUnit_Framework_TestCase
class InformationCollectedListenerTest extends TestCase
{
/**
* @var InformationCollectedListener
Expand Down

0 comments on commit f0d5e5f

Please sign in to comment.