Skip to content

Commit

Permalink
Merge branch '5.6' into 5.7
Browse files Browse the repository at this point in the history
* 5.6:
  [AllBundles] Enhancement: Streamline tests (#2827)
  [AllBundles] Fix test failure for stable deps
  Switch CI setup from travisci to github actions
  [NodeBundle] Fix: Wrong variable in PHPDoc
  Enhancement: Remove useless comments
  [AdminBundle] Fix: Indention
  [NodeBundle] Lower key limit to support mysql 5.6
  [AllBundles] Enable flintci
  [NodeBundle] Change nodetranslation slug/url fields to text type to allow long values
  [AdminBundle] Enhancement: Remove useless PHPDoc
  Fix: Remove useless test
  [AdminListBundle] Enhancement: Streamline tests
  Enhancement: Sort PHP-CS-Fixer rules alphabetically
  [ArticleBundle] Enhancement: Streamline tests
  Fix: Codestyle
  [ArticleBundle] Enhancement: Streamline tests
  [BehatBundle] Enhancement: Remove unit folder
  Enhancement: Use .php_cs.dist
  [AdminBundle] Enhancement: Streamline tests
  [AdminBundle] allow slug input-group to use more space if available
  • Loading branch information
acrobat committed Dec 8, 2020
2 parents 57adbea + 4fe3c4d commit f756e26
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 51 deletions.
8 changes: 0 additions & 8 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,8 @@
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;

/**
* This is the class that validates and merges configuration from your app/config files
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
*/
class Configuration implements ConfigurationInterface
{
/**
* {@inheritdoc}
*/
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('kunstmaan_utilities');
Expand Down
10 changes: 1 addition & 9 deletions DependencyInjection/KunstmaanUtilitiesExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,8 @@
use Symfony\Component\DependencyInjection\Loader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;

/**
* This is the class that loads and manages your bundle configuration
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
*/
class KunstmaanUtilitiesExtension extends Extension
{
/**
* {@inheritdoc}
*/
public function load(array $configs, ContainerBuilder $container)
{
$configuration = new Configuration();
Expand All @@ -30,7 +22,7 @@ public function load(array $configs, ContainerBuilder $container)
$container->setParameter('kunstmaan_utilities.cipher.secret', $config['cipher']['secret']);
}

$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('commands.yml');
$loader->load('services.yml');
}
Expand Down
5 changes: 0 additions & 5 deletions Helper/Cipher/Cipher.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ class Cipher implements CipherInterface
*/
private $secret;

/**
* Cipher constructor.
*
* @param $secret
*/
public function __construct($secret)
{
if (empty($secret)) {
Expand Down
3 changes: 0 additions & 3 deletions Helper/SlugifierInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

namespace Kunstmaan\UtilitiesBundle\Helper;

/**
* Interface SlugifierInterface
*/
interface SlugifierInterface
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
use PHPUnit\Framework\TestCase;

/**
* Class ConfigurationTest
*/
class ConfigurationTest extends TestCase
{
use ConfigurationTestCaseTrait;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;

/**
* Class KunstmaanUtilitiesExtensionTest
*/
class KunstmaanUtilitiesExtensionTest extends AbstractExtensionTestCase
{
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?php

namespace Tests\Kunstmaan\UtilitiesBundle\Helper\Cipher;
namespace Kunstmaan\UtilitiesBundle\Tests\Helper\Cipher;

use Kunstmaan\UtilitiesBundle\Helper\Cipher\Cipher;
use PHPUnit\Framework\TestCase;

/**
* CipherTest
*/
class CipherTest extends TestCase
{
const SECRET = 'secret';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests\Kunstmaan\UtilitiesBundle\Helper\Cipher;
namespace Kunstmaan\UtilitiesBundle\Tests\Helper\Cipher;

use Kunstmaan\UtilitiesBundle\Helper\Cipher\UrlSafeCipher;
use PHPUnit\Framework\TestCase;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?php

namespace Tests\Kunstmaan\UtilitiesBundle\Helper\Shell;
namespace Kunstmaan\UtilitiesBundle\Tests\Helper\Shell;

use Kunstmaan\UtilitiesBundle\Helper\Shell\Shell;
use PHPUnit\Framework\TestCase;

/**
* Class ShellTest
*/
class ShellTest extends TestCase
{
public function testShellFunctionality()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
<?php

namespace Tests\Kunstmaan\NodeBundle\Helper;
namespace Kunstmaan\NodeBundle\Tests\Helper;

use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
use PHPUnit\Framework\TestCase;

/**
* SlugifierTest
*/
class SlugifierTest extends TestCase
{
/**
* @var Slugifier
*/
private $slugifier;

/**
* {@inheritdoc}
*/
public function setUp(): void
{
$this->slugifier = new Slugifier();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
<?php

namespace Tests\Kunstmaan\UtilitiesBundle\Helper;
namespace Kunstmaan\UtilitiesBundle\Tests\Helper;

use Kunstmaan\UtilitiesBundle\Helper\UrlTransactionNamingStrategy;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;

/**
* Class UrlTransactionNamingStrategyTest
*/
class UrlTransactionNamingStrategyTest extends TestCase
{
public function testGetTransactionName()
Expand Down

0 comments on commit f756e26

Please sign in to comment.