Skip to content

Commit

Permalink
Merge remote-tracking branch 'ibexa/main' into temp_3.0_to_main
Browse files Browse the repository at this point in the history
  • Loading branch information
mnocon committed Mar 21, 2022
2 parents 5fa3edb + 577790f commit b79a0dc
Show file tree
Hide file tree
Showing 41 changed files with 322 additions and 537 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
fail-fast: false
matrix:
php:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/vendor/
composer.lock
.php_cs.cache
.php-cs-fixer.cache
/.phpunit.result.cache
11 changes: 6 additions & 5 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
->buildConfig()
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude([
'vendor',
'doc',
])
->in(
array_filter([
__DIR__ . '/src',
__DIR__ . '/tests',
], 'is_dir')
)
->files()->name('*.php')
);
2 changes: 0 additions & 2 deletions bundle/Resources/config/default_settings.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions bundle/Resources/config/services.yaml

This file was deleted.

35 changes: 22 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{
"name": "ezsystems/ezplatform-design-engine",
"description": "Design fallback mechanism for eZ Platform",
"name": "ibexa/design-engine",
"description": "Design fallback mechanism for Ibexa",
"license": "GPL-2.0-only",
"type": "ezplatform-bundle",
"type": "ibexa-bundle",
"replace": {
"ezsystems/ezplatform-design-engine": "*"
},
"authors": [
{
"name": "Jerome Vieilledent",
"email": "jerome@vieilledent.fr"
},
{
"name": "eZ Systems dev team",
"email": "dev-team@ez.no"
"name": "Ibexa Engineering & Community",
"homepage": "https://www.ibexa.co/products"
}
],
"require": {
"ezsystems/ezplatform-kernel": "^1.0@dev",
"php": "^7.4 || ^8.0",
"ibexa/core": "^4.0@dev",
"twig/twig": "^3.0",
"symfony/dependency-injection": "^5.0",
"symfony/http-kernel": "^5.0",
Expand All @@ -26,32 +30,37 @@
"symfony/templating": "^5.0"
},
"require-dev": {
"ezsystems/doctrine-dbal-schema": "^1.0@dev",
"ezsystems/ezplatform-code-style": "^1.0",
"ibexa/code-style": "^1.0",
"ibexa/doctrine-schema": "^4.0@dev",
"phpunit/phpunit": "^8.1",
"friendsofphp/php-cs-fixer": "^2.16.0",
"friendsofphp/php-cs-fixer": "^3.0",
"mikey179/vfsstream": "^1.6"
},
"autoload": {
"psr-4": {
"EzSystems\\EzPlatformDesignEngine\\": "lib",
"EzSystems\\EzPlatformDesignEngineBundle\\": "bundle"
"Ibexa\\DesignEngine\\": "src/lib/",
"Ibexa\\Bundle\\DesignEngine\\": "src/bundle/",
"Ibexa\\Contracts\\DesignEngine\\": "src/contracts/",
"EzSystems\\EzPlatformDesignEngine\\": "src/lib/",
"EzSystems\\EzPlatformDesignEngineBundle\\": "src/bundle/"
}
},
"autoload-dev": {
"psr-4": {
"Ibexa\\Tests\\Bundle\\DesignEngine\\": "tests/bundle/",
"Ibexa\\Tests\\DesignEngine\\": "tests/lib/",
"EzSystems\\EzPlatformDesignEngine\\Tests\\": "tests/lib",
"EzSystems\\EzPlatformDesignEngineBundle\\Tests\\": "tests/bundle"
}
},
"scripts": {
"fix-cs": "php-cs-fixer fix -v --show-progress=estimating",
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
"check-cs": "@fix-cs --dry-run",
"test": "phpunit"
},
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
"dev-main": "4.0.x-dev"
}
},
"conflict": {
Expand Down
75 changes: 0 additions & 75 deletions doc/README.md

This file was deleted.

58 changes: 0 additions & 58 deletions doc/assets.md

This file was deleted.

Loading

0 comments on commit b79a0dc

Please sign in to comment.