Skip to content

Commit 96a5abc

Browse files
tobias-93bobvandevijver
tobias-93
authored and
bobvandevijver
committed
Update tests
1 parent 565a55f commit 96a5abc

29 files changed

+753
-754
lines changed

‎.github/workflows/phpunit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
php: [ '8.1', '8.2', '8.3', '8.4' ]
14+
php: [ '8.2', '8.3', '8.4' ]
1515
name: On PHP ${{ matrix.php }}
1616

1717
steps:

‎.travis.yml

-26
This file was deleted.

‎ClassLoader/AdmingeneratedClassLoader.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function register(string $cacheDir): void
2626
return;
2727
}
2828
$this->basePath = $cacheDir;
29-
spl_autoload_register(array($this, 'loadClass'), true);
29+
spl_autoload_register([$this, 'loadClass'], true);
3030
self::$initialized = true;
3131
}
3232

‎Tests/Builder/BaseBuilderTest.php

+20-20
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,71 @@
77

88
class BaseBuilderTest extends TestCase
99
{
10-
public function testGetSimpleClassName()
10+
public function testGetSimpleClassName(): void
1111
{
1212
$builder = new BaseBuilder();
1313
$this->assertEquals('BaseBuilder', $builder->getSimpleClassName(), 'getSimpleClassName remove the namespaced part of get_class');
1414
$this->assertEquals('Bar', $builder->getSimpleClassName('\\Foo\\Bar'), 'getSimpleClassName remove the namespaced part of get_class');
1515
}
1616

17-
public function testGetDefaultTemplateName()
17+
public function testGetDefaultTemplateName(): void
1818
{
1919
$builder = new BaseBuilder();
2020
$this->assertEquals('BaseBuilder.php.twig', $builder->getDefaultTemplateName(), 'getDefaultTemplateName return the twig file path');
2121
}
2222

23-
public function testSetVariables()
23+
public function testSetVariables(): void
2424
{
2525
$builder = new BaseBuilder();
26-
$builder->setVariables(array('foo' => 'bar'));
27-
$this->assertEquals(array('foo' => 'bar'), $builder->getVariables(), 'setVariables accept an array');
26+
$builder->setVariables(['foo' => 'bar']);
27+
$this->assertEquals(['foo' => 'bar'], $builder->getVariables(), 'setVariables accept an array');
2828
}
2929

30-
public function testGetVariable()
30+
public function testGetVariable(): void
3131
{
3232
$builder = new BaseBuilder();
33-
$builder->setVariables(array('foo' => 'bar'));
33+
$builder->setVariables(['foo' => 'bar']);
3434
$this->assertEquals('bar', $builder->getVariable('foo','default'));
3535
$this->assertEquals('default', $builder->getVariable('nonexistant','default'));
3636

37-
$builder->setVariables(array('foo' => array('bar' =>'bazz')));
37+
$builder->setVariables(['foo' => ['bar' =>'bazz']]);
3838
$foo = $builder->getVariable('foo');
3939
$this->assertEquals('bazz', $foo['bar']);
4040
}
4141

42-
public function testHasVariable()
42+
public function testHasVariable(): void
4343
{
4444
$builder = new BaseBuilder();
45-
$builder->setVariables(array('foo' => 'bar'));
45+
$builder->setVariables(['foo' => 'bar']);
4646
$this->assertTrue($builder->hasVariable('foo'), 'hasVariable return true on a valid key');
4747
$this->assertFalse($builder->hasVariable('var'), 'hasVariable return false on a invalid key');
4848
}
4949

50-
public function testGetCode()
50+
public function testGetCode(): void
5151
{
5252
$builder = $this->initBuilder();
5353

5454
$this->assertEquals('Hello cedric!'."\n", $builder->getCode());
5555

56-
$builder->setVariables(array('name' => 'Tux'));
56+
$builder->setVariables(['name' => 'Tux']);
5757
$this->assertEquals('Hello Tux!'."\n", $builder->getCode(), 'If I change variables code is changed');
5858
}
5959

60-
public function testWriteOnDisk()
60+
public function testWriteOnDisk(): void
6161
{
6262
$builder = $this->initBuilder();
6363

6464
$builder->writeOnDisk(sys_get_temp_dir());
6565
$this->assertTrue(file_exists(sys_get_temp_dir() . '/test.php'));
6666
$this->assertEquals('Hello cedric!'."\n", file_get_contents(sys_get_temp_dir() . '/test.php'));
6767

68-
$builder->setVariables(array('name' => 'Tux'));
68+
$builder->setVariables(['name' => 'Tux']);
6969
$builder->writeOnDisk(sys_get_temp_dir());
7070
$this->assertTrue($builder->mustOverwriteIfExists());
7171
$this->assertTrue(file_exists(sys_get_temp_dir() . '/test.php'));
7272
$this->assertEquals('Hello Tux!'."\n", file_get_contents(sys_get_temp_dir() . '/test.php'), 'If i change variables code is changed');
7373

74-
$builder->setVariables(array('name' => 'cedric'));
74+
$builder->setVariables(['name' => 'cedric']);
7575
$builder->setMustOverwriteIfExists(false);
7676
$builder->writeOnDisk(sys_get_temp_dir());
7777
$this->assertFalse($builder->mustOverwriteIfExists());
@@ -84,14 +84,14 @@ public function testWriteOnDisk()
8484
$this->assertEquals('Hello cedric!'."\n", file_get_contents(sys_get_temp_dir() . '/test.php'), 'If i change variables on a non existant files code is generated');
8585
}
8686

87-
public function testGetModelClass()
87+
public function testGetModelClass(): void
8888
{
8989
$builder = new BaseBuilder();
90-
$builder->setVariables(array('model' => 'Admingenerator\DemoBundle\Entity\Movie'));
90+
$builder->setVariables(['model' => 'Admingenerator\DemoBundle\Entity\Movie']);
9191
$this->assertEquals('Movie', $builder->getModelClass());
9292
}
9393

94-
protected function initBuilder()
94+
protected function initBuilder(): BaseBuilder
9595
{
9696
$builder = new BaseBuilder();
9797
$generator = $this->getMockBuilder('Admingenerator\GeneratorBundle\Builder\Generator')
@@ -102,8 +102,8 @@ protected function initBuilder()
102102
$builder->setGenerator($generator);
103103
$builder->setMustOverwriteIfExists(true);
104104
$builder->setOutputName('test.php');
105-
$builder->setTemplateDirs(array(__DIR__.'/Fixtures/'));
106-
$builder->setVariables(array('name' => 'cedric'));
105+
$builder->setTemplateDirs([__DIR__.'/Fixtures/']);
106+
$builder->setVariables(['name' => 'cedric']);
107107
$builder->setTemplateName($builder->getDefaultTemplateName());
108108

109109
return $builder;

‎Tests/ClassLoader/AdmingeneratedClassLoaderTest.php

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,27 @@
44

55
use Admingenerator\GeneratorBundle\Tests\TestCase;
66
use Admingenerator\GeneratorBundle\ClassLoader\AdmingeneratedClassLoader;
7+
use PHPUnit\Framework\Attributes\DataProvider;
78

89
class AdmingeneratedClassLoaderTest extends TestCase
910
{
10-
/**
11-
* @dataProvider getLoadClassTests
12-
*/
13-
public function testLoadClass($className, $testClassName, $message)
11+
#[DataProvider('getLoadClassTests')]
12+
public function testLoadClass($className, $testClassName, $message): void
1413
{
1514
$loader = new AdmingeneratedClassLoader();
16-
$loader->setBasePath(realpath(sys_get_temp_dir()));
15+
$loader->register(realpath(sys_get_temp_dir()));
1716
$loader->loadClass($testClassName);
1817
$this->assertTrue(class_exists($className), $message);
1918
}
2019

21-
public function getLoadClassTests()
20+
public static function getLoadClassTests(): array
2221
{
23-
return array(
24-
array(
22+
return [
23+
[
2524
'\\Admingenerated\\AdmingeneratorDemoBundle\\BaseController\\ListController',
2625
'Admingenerated\\AdmingeneratorDemoBundle\\BaseController\\ListController',
2726
'->loadClass() loads admingenerated class'
28-
),
29-
);
27+
],
28+
];
3029
}
3130
}

‎Tests/DependencyInjection/ConfigurationTest.php

+30-34
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
namespace Admingenerator\GeneratorBundle\Tests\DependencyInjection;
44

55
use Admingenerator\GeneratorBundle\DependencyInjection\Configuration;
6+
use PHPUnit\Framework\TestCase;
67
use Symfony\Component\Config\Definition\Processor;
78

8-
class ConfigurationTest extends \PHPUnit_Framework_TestCase
9+
class ConfigurationTest extends TestCase
910
{
1011
/**
1112
* Test that default configuration is correctly initialized
1213
*/
13-
public function testDefaultConfig()
14+
public function testDefaultConfig(): void
1415
{
1516
$processor = new Processor();
1617
$config = $processor->processConfiguration(new Configuration('admingen_generator'), array());
@@ -21,13 +22,10 @@ public function testDefaultConfig()
2122
/**
2223
* Get waiting default values from configuration. If $key is not null
2324
* and is in first level keys, returns value of this specific key only.
24-
*
25-
* @param string $key
26-
* @return mixed
2725
*/
28-
private function getBundleDefaultConfig($key = null)
26+
private function getBundleDefaultConfig(string $key = null): mixed
2927
{
30-
static $defaultConfiguration = array(
28+
static $defaultConfiguration = [
3129
'generate_base_in_project_dir' => false,
3230
'use_doctrine_orm' => false,
3331
'use_doctrine_odm' => false,
@@ -46,22 +44,22 @@ private function getBundleDefaultConfig($key = null)
4644
'use_doctrine_orm_batch_remove' => false,
4745
'use_doctrine_odm_batch_remove' => false,
4846
'use_propel_batch_remove' => false,
49-
'twig' => array(
47+
'twig' => [
5048
'use_form_resources' => true,
5149
'use_localized_date' => false,
5250
'date_format' => 'Y-m-d',
5351
'datetime_format' => 'Y-m-d H:i:s',
5452
'localized_date_format' => 'medium',
5553
'localized_datetime_format' => 'medium',
56-
'number_format' => array(
54+
'number_format' => [
5755
'decimal' => 0,
5856
'decimal_point' => '.',
5957
'thousand_separator' => ','
60-
)
61-
),
62-
'templates_dirs' => array(),
63-
'form_types' => array(
64-
'doctrine_orm' => array(
58+
]
59+
],
60+
'templates_dirs' => [],
61+
'form_types' => [
62+
'doctrine_orm' => [
6563
'datetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
6664
'vardatetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
6765
'datetimetz' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
@@ -78,8 +76,8 @@ private function getBundleDefaultConfig($key = null)
7876
'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
7977
'array' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
8078
'boolean' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
81-
),
82-
'doctrine_odm' => array(
79+
],
80+
'doctrine_odm' => [
8381
'datetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
8482
'timestamp' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
8583
'vardatetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
@@ -101,8 +99,8 @@ private function getBundleDefaultConfig($key = null)
10199
'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
102100
'hash' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
103101
'boolean' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
104-
),
105-
'propel' => array(
102+
],
103+
'propel' => [
106104
'TIMESTAMP' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
107105
'BU_TIMESTAMP' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
108106
'DATE' => 'Symfony\Component\Form\Extension\Core\Type\DateType',
@@ -129,10 +127,10 @@ private function getBundleDefaultConfig($key = null)
129127
'ENUM' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
130128
'BOOLEAN' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
131129
'BOOLEAN_EMU' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
132-
),
133-
),
134-
'filter_types' => array(
135-
'doctrine_orm' => array(
130+
],
131+
],
132+
'filter_types' => [
133+
'doctrine_orm' => [
136134
'datetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
137135
'vardatetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
138136
'datetimetz' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
@@ -149,8 +147,8 @@ private function getBundleDefaultConfig($key = null)
149147
'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
150148
'array' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
151149
'boolean' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
152-
),
153-
'doctrine_odm' => array(
150+
],
151+
'doctrine_odm' => [
154152
'datetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
155153
'timestamp' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
156154
'vardatetime' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
@@ -172,8 +170,8 @@ private function getBundleDefaultConfig($key = null)
172170
'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
173171
'hash' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
174172
'boolean' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
175-
),
176-
'propel' => array(
173+
],
174+
'propel' => [
177175
'TIMESTAMP' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
178176
'BU_TIMESTAMP' => 'Symfony\Component\Form\Extension\Core\Type\DateTimeType',
179177
'DATE' => 'Symfony\Component\Form\Extension\Core\Type\DateType',
@@ -200,16 +198,14 @@ private function getBundleDefaultConfig($key = null)
200198
'ENUM' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
201199
'BOOLEAN' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
202200
'BOOLEAN_EMU' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
203-
),
204-
),
205-
'stylesheets' => array(),
206-
'javascripts' => array(),
201+
],
202+
],
203+
'stylesheets' => [],
204+
'javascripts' => [],
207205
'default_action_after_save' => 'edit',
208206
'throw_exceptions' => false,
209-
'use_doctrine_orm_batch_remove' => false,
210-
'use_doctrine_odm_batch_remove' => false,
211-
'use_propel_batch_remove' => false,
212-
);
207+
'generate_base_in_project_dir_directory' => 'admin',
208+
];
213209

214210
if (!is_null($key) && array_key_exists($key, $defaultConfiguration)) {
215211
return $defaultConfiguration[$key];

‎Tests/Filesystem/RelativePathComputerTest.php

+8-11
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@
22
namespace Admingenerator\GeneratorBundle\Tests\Filesystem;
33

44
use Admingenerator\GeneratorBundle\Filesystem\RelativePathComputer;
5+
use LogicException;
6+
use PHPUnit\Framework\TestCase;
57

6-
/**
7-
* Class RelativePathComputerTest
8-
* @package Admingenerator\GeneratorBundle\Tests\Filesystem
9-
* @author Stéphane Escandell
10-
*/
11-
class RelativePathComputerTest extends \PHPUnit_Framework_TestCase
8+
class RelativePathComputerTest extends TestCase
129
{
13-
public function testComputingToParent()
10+
public function testComputingToParent(): void
1411
{
1512
$referencePath = __FILE__;
1613

1714
$computer = new RelativePathComputer($referencePath);
1815
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 1), $computer->computeToParent(dirname($referencePath)));
19-
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 3), $computer->computeToParent(dirname(dirname(dirname($referencePath)))));
16+
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 3), $computer->computeToParent(dirname($referencePath, 3)));
2017

2118
$referencePath = dirname($referencePath);
2219
$computer = new RelativePathComputer($referencePath);
2320
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 1), $computer->computeToParent(dirname($referencePath)));
24-
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 3), $computer->computeToParent(dirname(dirname(dirname($referencePath)))));
21+
$this->assertEquals(str_repeat('..' . DIRECTORY_SEPARATOR, 3), $computer->computeToParent(dirname($referencePath, 3)));
2522
}
2623

27-
public function testExceptionThrowIfNotParent()
24+
public function testExceptionThrowIfNotParent(): void
2825
{
2926
$computer = new RelativePathComputer(__FILE__);
30-
$this->setExpectedException('\LogicException');
27+
$this->expectException(LogicException::class);
3128

3229
$computer->computeToParent(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Fake');
3330
}

0 commit comments

Comments
 (0)