Skip to content

Commit

Permalink
Merge pull request #24 from netgen/updated_directory_structure
Browse files Browse the repository at this point in the history
Updated directory structure
  • Loading branch information
emodric authored Oct 2, 2017
2 parents 62475f4 + 52438ef commit 9c3e0d4
Show file tree
Hide file tree
Showing 37 changed files with 41 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
CodeCoverage/
vendor/
var/
build/
composer.phar
composer.lock
phpunit.phar
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
filter:
excluded_paths:
- 'Tests/*'
- 'tests/*'
- 'vendor/*'
tools:
external_code_coverage: true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 22 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
"name": "netgen/enhanced-selection-bundle",
"description": "Netgen Enhanced Selection bundle for eZ Publish",
"type": "ezplatform-bundle",
"keywords": [
"ezpublish",
"ezplatform",
"netgen",
"enhanced-selection-bundle"
],
"homepage": "https://github.com/netgen/NetgenEnhancedSelectionBundle",
"license": "GPL-2.0",
"authors": [
{
Expand All @@ -14,7 +21,8 @@
},
"require-dev": {
"phpunit/phpunit": "^5.7|^6.0",
"netgen/ez-forms-bundle": "*"
"netgen/ez-forms-bundle": "^2.0",
"friendsofphp/php-cs-fixer": "~2.0"
},
"suggest": {
"netgen/enhancedselection2": "To edit this field type in legacy administration interface",
Expand All @@ -26,7 +34,19 @@
"ezsystems/ezplatform-solr-search-engine": "<1.2.0"
},
"autoload": {
"psr-4": { "Netgen\\Bundle\\EnhancedSelectionBundle\\": "" }
"psr-4": {
"Netgen\\Bundle\\EnhancedSelectionBundle\\": "bundle/"
}
},
"autoload-dev": {
"psr-4": {
"Netgen\\Bundle\\EnhancedSelectionBundle\\Tests\\": "tests/"
}
},
"scripts": {
"test": "@php vendor/bin/phpunit --colors=always",
"coverage": "@php -dzend_extension=xdebug.so vendor/bin/phpunit --colors=always",
"fix": "@php vendor/bin/php-cs-fixer fix"
},
"extra": {
"branch-alias": {
Expand Down
25 changes: 17 additions & 8 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
colors="true"
verbose="true"
processIsolation="false"
stopOnFailure="false"
>
<testsuites>
<testsuite name="Netgen\EnhancedSelectionBundle\Tests">
<directory>Tests</directory>
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>.</directory>
<directory suffix=".php">bundle</directory>
<exclude>
<directory>DependencyInjection</directory>
<directory>Resources</directory>
<directory>Tests</directory>
<directory>bundle/DependencyInjection</directory>
<directory>bundle/Resources</directory>
<directory>vendor</directory>
<file>Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
<file>Core/FieldType/EnhancedSelection/SearchField.php</file>
<file>NetgenEnhancedSelectionBundle.php</file>
<file>bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
<file>bundle/Core/FieldType/EnhancedSelection/SearchField.php</file>
<file>bundle/NetgenEnhancedSelectionBundle.php</file>
</exclude>
</whitelist>
</filter>
<logging>
<log type="junit" target="build/report.junit.xml"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
</phpunit>

0 comments on commit 9c3e0d4

Please sign in to comment.