Skip to content

Commit

Permalink
[Composer-Update] new library directory structure - see #3120
Browse files Browse the repository at this point in the history
  • Loading branch information
brusch committed Jul 23, 2018
1 parent ee419f1 commit c62924c
Show file tree
Hide file tree
Showing 6,739 changed files with 31 additions and 147 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 2 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

* -text

web/pimcore/static6/js/lib/* linguist-vendored
install-profiles/* linguist-vendored
bundles/AdminBundle/Resources/public/js/lib/* linguist-vendored

/.ci export-ignore
/.github export-ignore
/.travis export-ignore
/update-scripts export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
Expand Down
60 changes: 0 additions & 60 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,69 +1,9 @@
# remove the following ignores for your project
/app/constants.php

# symfony default
/.web-server-pid
/app/config/parameters.yml
/build/
/phpunit.xml
/web/bundles/

# local config
/.env
!/app/config/local
/app/config/local/*
!app/config/local/.gitkeep

# pimcore legacy (remove this for your own development)
!/legacy
/legacy/*
!legacy/.gitkeep
!legacy/bundle

/var/*
!/var/.gitkeep
!/var/classes/
/var/classes/DataObject

!/var/config
/var/config/system.php
/var/config/debug-mode.php
/var/config/maintenance.php

# project specific recommendations
/var/config/tag-manager.php
/var/config/reports.php


/web/var/
/web/sitemap*.xml

# PHP-CS-Fixer
/.php_cs
/.php_cs.cache

# composer.local.json is referenced in composer-merge-plugin
# remove this for your projects if you want to track the file
/composer.local.json

# composer
/composer.lock
/vendor/

# PhpStorm / IDEA
.idea
# NetBeans
nbproject

# codeception (only stage *.dist.yml config files)
/codeception.yml
/pimcore/codeception.yml
/pimcore/tests/*.suite.yml
/pimcore/tests/_output/*
/pimcore/tests/_support/_generated/*

# keep legacy paths ignored for easier migration
/plugins/
/tools/
/website/
.temp
17 changes: 7 additions & 10 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@

$finder = PhpCsFixer\Finder::create()
->in([
__DIR__ . '/app',
__DIR__ . '/install-profiles',
__DIR__ . '/pimcore',
__DIR__ . '/update-scripts'
__DIR__ . '/bundles',
__DIR__ . '/config',
__DIR__ . '/lib',
__DIR__ . '/models',
__DIR__ . '/tests'
])

->exclude([
__DIR__ . '/pimcore/tests/_output',
__DIR__ . '/pimcore/tests/_support/_generated',
__DIR__ . '/tests/_output',
__DIR__ . '/tests/_support/_generated',
])

// do not fix views
->notName('*.html.php')

// using notPath instead of exclude here as they can be nested (install-profiles)
->notPath('/var\/config/')
->notPath('/var\/classes/')
;

// do not enable self_accessor as it breaks pimcore models relying on get_called_class()
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
File renamed without changes

0 comments on commit c62924c

Please sign in to comment.