New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 2.0 #167

Merged
merged 25 commits into from Dec 15, 2017

Conversation

@andrerom
Member

andrerom commented Feb 22, 2017

Work in progress, contribution/review/thoughts welcome.

Done:

  • (not seen here are fixes in all repos to be symfony 2.8/3 compatible by a lot of contributors)
  • Merged in changes from symfony standard 3.3 & switched to use kernel 7.0 which requires php7
  • Cleaned up env parameters to remove most of env/docker.php concept and rather use:
    • Symfony 3.2 native env() system for runtime settings
    • incenteev parameter handler with env variable mapping for compile time settings (those used by config builders to validate config, e.g. mail transport for switfmailer)
      • Needs re compile on env variables change, might re add in env/docker.php instead
  • BC so far besides directory structure is:
    • removal of SYMFONY_CLASSLOADER_FILE as composer is handling all class loading now
    • removal of SYMFONY_HTTP_CACHE_CLASS, as with kernel if you need to do changes on AppCache it's "fine" to do it on the class and handle conflicts on upgrades yourself so you are aware of upstream changes.
    • removal of several parameters in favour of env() variables
  • Changs for new Admin UI

Todos:

  • DON'T MERGE THIS FROM GITHUB INTERFACE! Once ready, just close this PR, merge changes into master from git, and re configure master to 2.1! (leaving this branch for 2.0 release)
  • Get Behat and hence also travis to run again
  • Update docker config to work with the new ENVs

@andrerom andrerom referenced this pull request May 29, 2017

Merged

[WIP] 7.0 kernel branch #1875

1 of 3 tasks complete
Show outdated Hide outdated bower.json
Show outdated Hide outdated composer.json
Show outdated Hide outdated composer.json
Show outdated Hide outdated web/app.php
Show outdated Hide outdated web/app.php

@ezsystems ezsystems deleted a comment from ezrobot Oct 10, 2017

@ezsystems ezsystems deleted a comment from ezrobot Oct 13, 2017

@ezsystems ezsystems deleted a comment from ezrobot Oct 13, 2017

@ezsystems ezsystems deleted a comment from ezrobot Oct 16, 2017

@emodric

This comment has been minimized.

Show comment
Hide comment
@emodric

emodric Nov 22, 2017

Contributor

Is there any reason why app.php and app_dev.php are rewritten not to use SYMFONY_ENV and SYMFONY_DEBUG env variables?

Contributor

emodric commented Nov 22, 2017

Is there any reason why app.php and app_dev.php are rewritten not to use SYMFONY_ENV and SYMFONY_DEBUG env variables?

@andrerom

This comment has been minimized.

Show comment
Hide comment
@andrerom

andrerom Nov 22, 2017

Member

@emodric I don't think there is anyone besides starting of the admin ui work on pure symfony standard. @Nattfarinn Ok if I re align it with ezplatform 1.x again? Given symfony-standard is made obsolete by Flex by now anyway, we don't need to trow away the enhancements we added over the years here now (as it will make upgrades harder).

Member

andrerom commented Nov 22, 2017

@emodric I don't think there is anyone besides starting of the admin ui work on pure symfony standard. @Nattfarinn Ok if I re align it with ezplatform 1.x again? Given symfony-standard is made obsolete by Flex by now anyway, we don't need to trow away the enhancements we added over the years here now (as it will make upgrades harder).

@Nattfarinn

This comment has been minimized.

Show comment
Hide comment
@Nattfarinn

Nattfarinn Nov 22, 2017

Contributor

@andrerom I'm perfectly fine with realign. I guess we can revert app.php to previous version (or just tweak current one). @alongosz suggested even to prepare it for upcoming Symfony 4 (public/index.php and so on) but I'm rather sceptical (yet its always matter of discussion).

Contributor

Nattfarinn commented Nov 22, 2017

@andrerom I'm perfectly fine with realign. I guess we can revert app.php to previous version (or just tweak current one). @alongosz suggested even to prepare it for upcoming Symfony 4 (public/index.php and so on) but I'm rather sceptical (yet its always matter of discussion).

@andrerom

This comment has been minimized.

Show comment
Hide comment
@andrerom

andrerom Nov 23, 2017

Member

@alongosz suggested even to prepare it for upcoming Symfony 4 (public/index.php and so on) but I'm rather sceptical (yet its always matter of discussion).

yep, we can do that when we add symfony flex support, in which case this repo is obsolete, no need to break everything twice.

I'll realign the branches again then.

Member

andrerom commented Nov 23, 2017

@alongosz suggested even to prepare it for upcoming Symfony 4 (public/index.php and so on) but I'm rather sceptical (yet its always matter of discussion).

yep, we can do that when we add symfony flex support, in which case this repo is obsolete, no need to break everything twice.

I'll realign the branches again then.

@andrerom

This comment has been minimized.

Show comment
Hide comment
@andrerom

andrerom Nov 23, 2017

Member

@emodric rebased, slimmed down the diff while at it @Nattfarinn. Might be ok to move this to review now.

Member

andrerom commented Nov 23, 2017

@emodric rebased, slimmed down the diff while at it @Nattfarinn. Might be ok to move this to review now.

_ezpublishRestOptionsRoutes:

This comment has been minimized.

@andrerom

andrerom Nov 23, 2017

Member

We don't need REST options routes anymore?

@andrerom

andrerom Nov 23, 2017

Member

We don't need REST options routes anymore?

prefix: '%ezpublish_rest.path_prefix%'
type: rest_options
_liip_imagine:

This comment has been minimized.

@andrerom

andrerom Nov 23, 2017

Member

Was this ever used for anything in the first place? aka should it not be in 1.x either? /cc @bdunogier

@andrerom

andrerom Nov 23, 2017

Member

Was this ever used for anything in the first place? aka should it not be in 1.x either? /cc @bdunogier

mikadamczyk and others added some commits Nov 24, 2017

[vhost.template] Remove unneeded section for behat testing
As we now use docker containers for most behat testing the inline workaround for issues with travis can be removed from the template.
Show outdated Hide outdated composer.json

Nattfarinn and others added some commits Dec 6, 2017

EZP-28375: As a Maintainer I want CI to run tests on behat environmen…
…t of eZ Platform v2 (#232)

* [Composer] EZP-28223: Added dependency on ezsystems/behatbundle

* EZP-28223: Enabled Behat bundles in AppKernel

* [REST Tests] Added dependency on phpunit/phpunit to run REST tests

REST Functional tests are run from within docker container of
ezplatform web app, so phpunit is required

* [Travis] Deprecated setup_from_external_repo script

* [Travis] Created setup_ezplatform script for dockerized test setup

* [Travis] Used setup_ezplatform script to setup docker containers

* [Travis] Added EZP-27752 create language command

* EZP-28223: Fixed default behat configuration

* [Travis] Optimized dependency setup for behat test

Instead of using composer pointing to local checkout, it installs all
dependencies and then overwrites the one being tested

It's less time consuming, because composer doesn't try to read all
tags and branches to find matching dependency before realizing
the one its looking for truly exists in the local checkout :)

* [Behat] Added BehatBundle behat profile with suites

* [Composer][AppKernel] Enabled eZ Platform Design Engine bundle

* EZP-28375: Restored Behat configuration
[Travis] Use .env file for picking install (#238)
* [Travis] Use .env file for picking install

* [Travis] For now disable testing on varnsih
@wizhippo

This comment has been minimized.

Show comment
Hide comment
@wizhippo

wizhippo Dec 15, 2017

Contributor

Defining admin_group_name the makes the illusion it is configurable when it is hard coded in https://github.com/ezsystems/ezplatform-admin-ui/blob/master/src/bundle/EzPlatformAdminUiBundle.php#L20

Contributor

wizhippo commented on app/config/default_parameters.yml in 9d65b07 Dec 15, 2017

Defining admin_group_name the makes the illusion it is configurable when it is hard coded in https://github.com/ezsystems/ezplatform-admin-ui/blob/master/src/bundle/EzPlatformAdminUiBundle.php#L20

@andrerom andrerom merged commit 6a13575 into master Dec 15, 2017

0 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
platformsh Platform.sh: Environment deployment started
Details
@andrerom

This comment has been minimized.

Show comment
Hide comment
@andrerom

andrerom Dec 15, 2017

Member

Master is now 2.1! 🌮

Member

andrerom commented Dec 15, 2017

Master is now 2.1! 🌮

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment