Skip to content

Commit

Permalink
Merge pull request #24 from xprojects-de/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
xprojects-de authored Mar 23, 2021
2 parents 8ec3029 + 3b40bdd commit aec5388
Show file tree
Hide file tree
Showing 19 changed files with 962 additions and 932 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
/nbproject/private/
/.idea/
/public/
/.run/
/vendor/
/composer.lock
12 changes: 9 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"name": "alpdesk/alpdesk-parallax",
"description": "Parallax for Contao 4",
"keywords": ["contao", "alpdesk", "Parallax"],
"keywords": [
"contao",
"alpdesk",
"Parallax"
],
"type": "contao-bundle",
"homepage": "https://github.com/xprojects-de/alpdesk-parallax",
"license": "LGPL-3.0-or-later",
Expand All @@ -24,7 +28,9 @@
"contao/manager-plugin": "<2.0 || >=3.0"
},
"require-dev": {
"contao/manager-plugin": "^2.0"
"contao/manager-plugin": "^2.0",
"vimeo/psalm": "^4.6",
"phpstan/phpstan": "^0.12.82"
},
"autoload": {
"psr-4": {
Expand All @@ -38,4 +44,4 @@
"config": {
"contao-component-dir": "public"
}
}
}
10 changes: 0 additions & 10 deletions nbproject/project.properties

This file was deleted.

9 changes: 0 additions & 9 deletions nbproject/project.xml

This file was deleted.

12 changes: 12 additions & 0 deletions psaml.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<psalm
errorLevel="7"
phpVersion="7.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src"/>
</projectFiles>
</psalm>
5 changes: 3 additions & 2 deletions src/AlpdeskParallaxBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Symfony\Component\HttpKernel\Bundle\Bundle;

class AlpdeskParallaxBundle extends Bundle {

class AlpdeskParallaxBundle extends Bundle
{

}
11 changes: 6 additions & 5 deletions src/ContaoManager/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;

class Plugin implements BundlePluginInterface {

public function getBundles(ParserInterface $parser) {
return [BundleConfig::create(AlpdeskParallaxBundle::class)->setLoadAfter([ContaoCoreBundle::class])];
}
class Plugin implements BundlePluginInterface
{
public function getBundles(ParserInterface $parser)
{
return [BundleConfig::create(AlpdeskParallaxBundle::class)->setLoadAfter([ContaoCoreBundle::class])];
}

}
18 changes: 12 additions & 6 deletions src/DependencyInjection/AlpdeskParallaxExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

class AlpdeskParallaxExtension extends Extension {

public function load(array $mergedConfig, ContainerBuilder $container) {
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yml');
}
class AlpdeskParallaxExtension extends Extension
{
/**
* @param array $configs
* @param ContainerBuilder $container
* @throws \Exception
*/
public function load(array $configs, ContainerBuilder $container)
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yml');
}

}
Loading

0 comments on commit aec5388

Please sign in to comment.