[WIP] [ThemeBundle] Introduction of ThemeBundle by pamil · Pull Request #1 · pamil/Sylius

pamil · 2015-05-29T10:15:34Z

Important changes:

Templates: changed loading order (priority descending, bolded are new ones):
- App templates:
  - <Theme>/views
  - app/Resources/views
- Bundle templates:
  - <Theme>/<Bundle name>/views
  - app/Resources/<Bundle name>/views
  - <Bundle>/Resources/views
Translations: changed loading order (priority descending, bolded are new ones):
- <Theme>/translations
- <Theme>/<Bundle name>/translations
- app/Resources/translations
- app/Resources/<Bundle name>/translations
- <Bundle>/Resources/translations
Assets: chaged the way command assets:install works:
- Since now, assets:install with --symlink or --relative parameters, creates symlinks for every installed asset file, not for entire asset directory (eg. if AcmeBundle/Resources/public/asset.js exists, it creates symlink web/bundles/acme/asset.js leading to AcmeBundle/Resources/public/asset.js instead of symlink web/bundles/acme/ leading to AcmeBundle/Resources/public/). When you create new asset or delete existing one, it is required to rerun this command to apply changes (just as the hard copy option works).

TODO:

michalmarcinkowski · 2015-06-01T12:24:31Z

src/Sylius/Bundle/ThemeBundle/.travis.yml

pamil · 2015-06-01T20:48:15Z

Thanks @michalmarcinkowski! :)

michalmarcinkowski · 2015-06-01T23:21:18Z

I didn't finish, there will be more ;)

michalmarcinkowski · 2015-06-02T07:49:27Z

src/Sylius/Bundle/ThemeBundle/Context/ThemeContext.php

Why can't we keep Themes in array with logical name as an array key? We can then do the following:

return $this->themes[$logicalName];

Good idea! :)

Fix Behat on test_cached

[Behat] Add scenarios for adding select attribute type

Update from Sylius

Make channel pricing translatable

Uncaught Symfony\Component\Debug\Exception\ContextErrorException: Warning: Cannot bind closure to scope of internal class ReflectionProperty in /Users/pamil/Projects/Sylius/Sylius/var/cache/test/appTestProjectContainer.php:28784 Stack trace: #0 [internal function]: SyliusBundleChannelBundleDoctrineORMChannelRepository_000000004a4ae55b000000001fee2e9bc41b18016a7f6458d1a51d748b49311b->__set('_entityName', NULL) #1 /Users/pamil/Projects/Sylius/Sylius/app/TestAppKernel.php(72): ReflectionProperty->setValue(Object(SyliusBundleChannelBundleDoctrineORMChannelRepository_000000004a4ae55b000000001fee2e9bc41b18016a7f6458d1a51d748b49311b), NULL) #2 /Users/pamil/Projects/Sylius/Sylius/app/TestAppKernel.php(41): TestAppKernel->cleanupContainer(Object(appTestProjectContainer)) #3 /Users/pamil/Projects/Sylius/Sylius/vendor/lakion/api-test-case/src/ApiTestCase.php(85): TestAppKernel->shutdown() #4 /Users/pamil/Projects/Sylius/Sylius/vendor/phpunit/phpunit/src/Framework/TestSuite.php(727): Lakion\ApiTestCase\ApiTestCase::ensur in /Users/pamil/Projects/Sylius/Sylius/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpKernel.php on line 99

fork update

[BC BREAK] Symfony 4.0 compatibility, part #1

This PR was merged into the 1.7 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT Should resolve: ```bash PHP Fatal error: Uncaught Psalm\Exception\TypeParseTreeException: Unterminated bracket in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php:571 Stack trace: #0 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Type.php(171): Psalm\Internal\Type\ParseTree::createFromTokens(Array) #1 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2668): Psalm\Type::parseTokens(Array) #2 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2207): Psalm\Internal\Visitor\ReflectorVisitor->getAssertionParts('array<array-key...', Object(PhpParser\Node\Stmt\Function_)) #3 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(323): Psalm\Internal\Visitor\ReflectorVisitor->registerFunctionLike(Object(PhpParser\Node\Stmt\Function_)) #4 /home/travis/build/Sylius/Sylius/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php(200): Psalm\Internal\Visitor\Reflect in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php on line 571 Fatal error: Uncaught Psalm\Exception\TypeParseTreeException: Unterminated bracket in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php:571 Stack trace: #0 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Type.php(171): Psalm\Internal\Type\ParseTree::createFromTokens(Array) #1 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2668): Psalm\Type::parseTokens(Array) #2 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(2207): Psalm\Internal\Visitor\ReflectorVisitor->getAssertionParts('array<array-key...', Object(PhpParser\Node\Stmt\Function_)) #3 /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Visitor/ReflectorVisitor.php(323): Psalm\Internal\Visitor\ReflectorVisitor->registerFunctionLike(Object(PhpParser\Node\Stmt\Function_)) #4 /home/travis/build/Sylius/Sylius/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php(200): Psalm\Internal\Visitor\Reflect in /home/travis/build/Sylius/Sylius/vendor/vimeo/psalm/src/Psalm/Internal/Type/ParseTree.php on line 571 ``` Ref. https://travis-ci.org/github/Sylius/Sylius/jobs/682877325 Ref. amphp/amp#314  Commits ------- f6819a2 [Maintenance] Upgrade psalm version

pamil self-assigned this May 29, 2015

pamil changed the title ~~[ThemeBundle] Introduction of ThemeBundle~~ [WIP] [ThemeBundle] Introduction of ThemeBundle May 29, 2015

michalmarcinkowski reviewed Jun 1, 2015
View reviewed changes

src/Sylius/Bundle/ThemeBundle/.travis.yml Outdated

Copy link
Copy Markdown

michalmarcinkowski Jun 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove 5.3

michalmarcinkowski reviewed Jun 2, 2015
View reviewed changes

pamil added 8 commits June 26, 2015 13:56

[ThemeBundle] Introduced assets support

5f4a6af

[ThemeBundle] Applied code review comments

8a9e93a

[ThemeBundle] Removed manual tests, refactored code a little bit

189fdb2

[ThemeBundle] Added templating integration tests

64243d7

[ThemeBundle] Added translation integration tests

39aefcf

[ThemeBundle] Fixed PathResolver

a4cec51

[ThemeBundle] Added assets integration tests

9b5df51

[ThemeBundle] Fixed assets:install command

6fc268a

pamil force-pushed the theme-bundle branch from 1f848ee to 6fc268a Compare June 26, 2015 11:57

pamil added 3 commits June 26, 2015 16:57

[ThemeBundle] Updated dependencies

1e77373

[ThemeBundle] CS fixes

e31dad0

[ThemeBundle] Added support for theme inheritance

c902599

pamil force-pushed the theme-bundle branch from 703e934 to c902599 Compare June 26, 2015 19:28

pamil closed this Jun 26, 2015

pamil added a commit that referenced this pull request Nov 17, 2015

[Travis] Combined suites #1 and #2 into one

cef9780

pamil added a commit that referenced this pull request Nov 17, 2015

[Travis] Combined suites #1 and #2 into one

40addcd

pamil added a commit that referenced this pull request Nov 17, 2015

[Travis] Combined suites #1 and #2 into one

9136d7f

pamil added a commit that referenced this pull request Nov 18, 2015

[Travis] Combined suites #1 and #2 into one

847c089

pamil added a commit that referenced this pull request Nov 18, 2015

[Travis] Combined suites #1 and #2 into one

39a8cca

pamil pushed a commit that referenced this pull request Jun 14, 2016

Merge pull request #1 from pamil/Arminek/new-shop-reset-password

373de35

Fix Behat on test_cached

pamil pushed a commit that referenced this pull request Feb 21, 2017

Merge pull request #1 from Arminek/attribute_select_behat

311785e

[Behat] Add scenarios for adding select attribute type

pamil pushed a commit that referenced this pull request Feb 26, 2017

Merge pull request #1 from Sylius/master

7ab81cc

Update from Sylius

pamil pushed a commit that referenced this pull request Mar 8, 2017

Merge pull request #1 from pamil/pull-request/7087

c3d6e8b

Make channel pricing translatable

pamil pushed a commit that referenced this pull request Feb 1, 2018

Merge pull request #1 from Sylius/master

c818885

fork update

pamil added a commit that referenced this pull request Apr 27, 2018

Merge pull request Sylius#9366 from pamil/1.2-symfony-4.0-application

f7d42d2

[BC BREAK] Symfony 4.0 compatibility, part #1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] [ThemeBundle] Introduction of ThemeBundle#1

[WIP] [ThemeBundle] Introduction of ThemeBundle#1
pamil wants to merge 18 commits intomasterfrom
theme-bundle

pamil commented May 29, 2015

Uh oh!

michalmarcinkowski Jun 1, 2015

Uh oh!

pamil commented Jun 1, 2015

Uh oh!

michalmarcinkowski commented Jun 1, 2015

Uh oh!

michalmarcinkowski Jun 2, 2015

Uh oh!

pamil Jun 3, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

pamil commented May 29, 2015

Uh oh!

michalmarcinkowski Jun 1, 2015

Choose a reason for hiding this comment

Uh oh!

pamil commented Jun 1, 2015

Uh oh!

michalmarcinkowski commented Jun 1, 2015

Uh oh!

michalmarcinkowski Jun 2, 2015

Choose a reason for hiding this comment

Uh oh!

pamil Jun 3, 2015

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants