[WIP] 2.0 by andrerom · Pull Request #167 · ezsystems/ezplatform

andrerom · 2017-02-22T20:25:49Z

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

lolautruche · 2017-05-02T11:32:38Z

-            field_name: ezxform_token
+    form:            ~
+    csrf_protection:
+        enabled: true


You could just add:

csrf_protection: ~

Will adapt when rebasing up from master ;)

andrerom · 2017-10-10T08:29:12Z

-    translator: { fallback: '%locale_fallback%' }
-    secret: '%env(SYMFONY_SECRET)%'
+    translator: { fallback: "%locale_fallback%" }
+    secret: "%env(SYMFONY_SECRET)%"


any reason why we changed back to "?
Reason why it was changed to ' was to stay close to upstream: https://github.com/symfony/symfony-standard/blob/3.4/app/config/config.yml#L11-L24

So maybe we we can rebase these changes away to reduce the diff (which will cause conflict when rebasing on master again).

andrerom · 2017-10-10T08:30:05Z


-_ezpublishRoutes:
-    resource: '@EzPublishCoreBundle/Resources/config/routing/internal.yml'
+kernel.internal:


should these have ez. prefix?

andrerom · 2017-10-10T08:44:35Z

    - { resource: parameters.yml }
    - { resource: security.yml }
-    - { resource: env/docker.php }
-    - { resource: env/platformsh.php }


Did we find a way to avoid them? Or should we re add these?

I was originally trying to remove the docker one thing I could do everything with env, but the cache case remaining in env/docker.php I did not manage to find a way around.

Also afaik don't think we can avoid the env/platformsh.php in some form as the env variable comes as a json string.

andrerom · 2017-10-10T08:46:37Z

            logout: ~

-        main:
+        default:


It's main in symfony 3.x: https://github.com/symfony/symfony-standard/blob/3.4/app/config/security.yml#L16 But if that breaks anything I guess we have changes to do other places to if we want to adapt for it.

also the comments comes from same source.

andrerom · 2017-10-10T08:48:40Z

+{
+  "name": "ezplatform-admin-ui",
+  "authors": [
+    "Nattfarinn <nattfarinn@gmail.com>"


If we allign with composer.json we would need to adopt this.

ref:

{ "name": "eZ dev-team & eZ Community", "homepage": "https://github.com/ezsystems/ezplatform/contributors" },

That one is surprisingly my modification 😀
bower install said to me:

bower invalid-meta The "name" is recommended to be lowercase, can contain digits, dots, dashes

With ampersand it even crashes :)

Well it doesn't need to be the exact same, point it so attribute teams and not the once who created the file in question ;)

So we're talking about two things:

name is supposed to be package name, not author

author here really should be eZ dev-team & eZ Community

But... @sunpietro and @dew326 mentioned to me yesterday that bower won't even be a part of final version, as there will be separate repository with already downloaded assets, right guys?

a part of final version, as there will be separate repository with already downloaded assets, right guys?

makes sense, was strange to find it here, then of course ignore this thread and let's not waste more breath on it :)

andrerom · 2017-10-10T08:50:41Z

    "description": "eZ Platform distribution",
    "homepage": "https://github.com/ezsystems/ezplatform",
    "license": "GPL-2.0",
-    "type": "project",


should not be removed here, cause if it is it will default to library:
https://getcomposer.org/doc/04-schema.md#type

Edit: I see it was moved down, we can remove this change in rebase

andrerom · 2017-10-10T08:53:26Z

-            }
-        },
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"


note: we'll need this once this is master again

andrerom · 2017-10-10T08:54:13Z

-if (($useDebugging = getenv('SYMFONY_DEBUG')) === false || $useDebugging === '') {
-    $useDebugging = $environment === 'dev';
+require __DIR__.'/../vendor/autoload.php';
+if (PHP_VERSION_ID < 70000) {


as we require higher version of PHP then 7.0 we can ommit thise lines

It's Symfony standard app.php file. I didn't change it at all, but you're right - we can remove this. :)

andrerom · 2017-10-10T09:02:20Z

+if (PHP_VERSION_ID < 70000) {
+    $kernel->loadClassCache();
 }
+//$kernel = new AppCache($kernel);


hmm, unsure on this. App cache should probably be on by default in eZ for better first impression for people installing, but having it on implies we need the env variables for it to be able to reconfigure for demos. Also for our own demo system it implies we are forced to use Varnish, however we are cable of doing that now so maybe it's ok on that point at least.

But maybe all this doesn't matter, if we manage to change to use Symfony Flex (which we imho should, too many benefits..) all of these things will need to be configurable with ENVs and stuff anyway as root is auto generated by flex based on packages.

in anycase, if this needs to be commented here, i would add another comment to say why that's is commented. if not, to me code commented = code that can be deleted.

@crevillo not needed yet, this is pre beta, we will probably revert some of these changes. this is very much WIP ;)

We must just make sure that we don't forget about it. Maybe a todo item in the PR ?

I'll add a todo to review more of the changes introduced in EZP-27888: Prepare Meta repository to use new eZ Platform Admin UI, but at least the AppCache stuff has been activated again in latests rebase here.

Closes #204

* EZP-28018: Add Behat configuration and dependencies * EZP-28018: Use SYMFONY_ENV as env value * Revert "EZP-28018: Use SYMFONY_ENV as env value" This reverts commit 1a84e15.

andrerom · 2017-11-23T11:42:18Z

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

andrerom · 2017-11-23T11:45:59Z

+                purge_servers: ['%env(PURGE_SERVERS)%']
+            # Temporary hard coding session name during v2 development
+            session:
+                name: eZSESSID


Do we still need this for admin UI or was it a hybrid ui temprary issue that we can now revert / rebase out ?

andrerom · 2017-11-23T11:46:40Z

-    prefix: '%ezpublish_rest.path_prefix%'
+    prefix: /api/ezp/v2

-_ezpublishRestOptionsRoutes:


We don't need REST options routes anymore?

andrerom · 2017-11-23T11:48:46Z

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


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

As we now use docker containers for most behat testing the inline workaround for issues with travis can be removed from the template.

…o 0.3

andrerom · 2017-11-30T20:15:36Z

        "ezsystems/ezplatform-admin-ui": "^1.0@dev",
        "ezsystems/ezplatform-admin-ui-modules": "^1.0@dev",
-        "ezsystems/ezplatform-admin-ui-assets": "^0.3",
+        "ezsystems/ezplatform-admin-ui-assets": "^0.4",


If ezsystems/ezplatform-admin-ui would specify this as dependency we would only need to specify it here and bump it when needing non stable packages ("0.x" is in that sense considered "stable").

Issue: symfony/symfony#25329

…wing fallback to env vars (#233)

…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 * [Travis] For now disable testing on varnsih

andrerom · 2017-12-15T16:28:59Z

Master is now 2.1! 🌮

andrerom force-pushed the 2.0 branch 3 times, most recently from dbfae82 to f9630d7 Compare March 1, 2017 20:07

andrerom force-pushed the 2.0 branch from f9630d7 to e11b337 Compare March 11, 2017 09:21

andrerom force-pushed the 2.0 branch 2 times, most recently from aabb79c to 619ef66 Compare March 21, 2017 16:37

lolautruche reviewed May 2, 2017

View reviewed changes

andrerom force-pushed the 2.0 branch from 619ef66 to 3c49902 Compare May 4, 2017 09:23

andrerom mentioned this pull request May 29, 2017

[WIP] 7.0 kernel branch ezsystems/ezpublish-kernel#1875

Merged

1 of 3 tasks

andrerom force-pushed the 2.0 branch 3 times, most recently from 26311ad to 9b03747 Compare June 4, 2017 16:44

andrerom force-pushed the 2.0 branch from a475852 to e472cb2 Compare August 27, 2017 18:10

andrerom mentioned this pull request Aug 27, 2017

Switch to composer/installers 1.4 #199

Closed

andrerom commented Oct 10, 2017

View reviewed changes

ezsystems deleted a comment from ezrobot Oct 10, 2017

andrerom force-pushed the 2.0 branch from fafee3a to a6d1263 Compare October 13, 2017 12:48

ezsystems deleted a comment from ezrobot Oct 13, 2017

andrerom force-pushed the 2.0 branch from a6d1263 to fa4aa9b Compare October 13, 2017 16:46

ezsystems deleted a comment from ezrobot Oct 16, 2017

Nattfarinn force-pushed the 2.0 branch from 9436030 to c7edea7 Compare November 6, 2017 17:08

Nattfarinn and others added 6 commits November 23, 2017 12:23

EZP-27888: Prepare Meta repository to use new eZ Platform Admin UI

7470410

EZP-27499: Update platform.sh hooks for v2.x

1c84b37

Closes #204

Install react modules (#217)

3a91d18

Enable Admin UI Assets bundle

9e7ccaf

EZP-28018: Add Behat dependencies and configuration (#223)

df34987

* EZP-28018: Add Behat configuration and dependencies * EZP-28018: Use SYMFONY_ENV as env value * Revert "EZP-28018: Use SYMFONY_ENV as env value" This reverts commit 1a84e15.

fix: JMS Translations config

0f9ffd0

andrerom force-pushed the 2.0 branch from 9b0ffb1 to 0f9ffd0 Compare November 23, 2017 11:36

andrerom commented Nov 23, 2017

View reviewed changes

mikadamczyk and others added 5 commits November 24, 2017 14:35

Add WhiteOctoberPagerfantaBundle (#227)

18ec04c

[vhost.template] Remove unneeded section for behat testing

6dc91b8

As we now use docker containers for most behat testing the inline workaround for issues with travis can be removed from the template.

[composer] Updated version for ezsystems/ezplatform-admin-ui-assets t…

59b9076

…o 0.3

Update Docker readme to refer to "/admin"

41b57bb

Update composer.json

ac8f9b1

andrerom commented Nov 30, 2017

View reviewed changes

Nattfarinn and others added 10 commits December 6, 2017 15:34

Force Symfony 3.4.0 because of regression in 3.4.1

5a1ec4c

Issue: symfony/symfony#25329

EZP-28434 As a developer, I want to compile sass in assetic (#235)

4266006

Refactor param names to keep BC with eZ Platform 1.x while still allo…

fdeecc1

…wing fallback to env vars (#233)

Merge branch 'master' into 2.0

97145d4

EZP-28511: Cannot use assetic:watch (#237)

f6182e6

[Travis] Use .env file for picking install (#238)

a4c016b

* [Travis] Use .env file for picking install * [Travis] For now disable testing on varnsih

[Travis] Added check if overwriting dependency was successful

dc962b9

fix: Add "admin" siteaccess to configuration (#240)

9d65b07

Merge branch 'master' into 2.0

6a13575

andrerom merged commit 6a13575 into master Dec 15, 2017

andrerom pushed a commit that referenced this pull request Dec 2, 2020

Updated TTL license (#167)

bf875e0

Conversation

andrerom commented Feb 22, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom May 2, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 10, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Oct 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom commented Nov 23, 2017

Uh oh!

andrerom Nov 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom Nov 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrerom commented Dec 15, 2017

Uh oh!

Reviewers

Assignees

andrerom commented Feb 22, 2017 •

edited

Loading

andrerom May 2, 2017 •

edited

Loading

andrerom Oct 10, 2017 •

edited

Loading

andrerom Oct 10, 2017 •

edited

Loading

andrerom Oct 11, 2017 •

edited

Loading

andrerom Oct 11, 2017 •

edited

Loading

andrerom Oct 10, 2017 •

edited

Loading

andrerom Oct 10, 2017 •

edited

Loading

andrerom Oct 11, 2017 •

edited

Loading

andrerom Nov 23, 2017 •

edited

Loading

andrerom Nov 23, 2017 •

edited

Loading