Improve updater style to match ownCloud core styles + fixing typos and c... #41

Merged
merged 2 commits into from Oct 20, 2014

Conversation

Projects
None yet
3 participants
@DeepDiver1975
Member

DeepDiver1975 commented Oct 9, 2014

...ode style

@DeepDiver1975

This comment has been minimized.

Show comment
Hide comment
@DeepDiver1975

DeepDiver1975 Oct 9, 2014

Member

@VicDeo @owncloud/designers please review once more the backport to stable7 - THX

Member

DeepDiver1975 commented Oct 9, 2014

@VicDeo @owncloud/designers please review once more the backport to stable7 - THX

@DeepDiver1975

This comment has been minimized.

Show comment
Hide comment
Member

DeepDiver1975 commented Oct 17, 2014

@karlitschek

This comment has been minimized.

Show comment
Hide comment
@karlitschek

karlitschek Oct 18, 2014

Member

very nice 👍

Member

karlitschek commented Oct 18, 2014

very nice 👍

@VicDeo

This comment has been minimized.

Show comment
Hide comment
@VicDeo

VicDeo Oct 20, 2014

Member

@DeepDiver1975 I got thrice

{"reqId":"5445436f0ac8b","app":"PHP","message":"Cannot redeclare class OC\HTTPHelper at oc6/lib/private/httphelper.php#11","level":3,"time":"2014-10-20T17:16:31+00:00","method":"POST","url":"/oc7/index.php/apps/updater/ajax/update.php"}

This seems to be neither this PR nor Updater fault but it makes updater unusable and I don't know where to look further.
Is it related to classloader or else?

Member

VicDeo commented Oct 20, 2014

@DeepDiver1975 I got thrice

{"reqId":"5445436f0ac8b","app":"PHP","message":"Cannot redeclare class OC\HTTPHelper at oc6/lib/private/httphelper.php#11","level":3,"time":"2014-10-20T17:16:31+00:00","method":"POST","url":"/oc7/index.php/apps/updater/ajax/update.php"}

This seems to be neither this PR nor Updater fault but it makes updater unusable and I don't know where to look further.
Is it related to classloader or else?

@VicDeo

This comment has been minimized.

Show comment
Hide comment
@VicDeo

VicDeo Oct 20, 2014

Member

Both 3rdparty and core upgrade are passed smoothly and it happens before upgrading apps:

{"reqId":"5445495d9f4ec","app":"updater","message":"Success: 3rdparty","level":1,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}
{"reqId":"5445495d9f4ec","app":"updater","message":"Success: core","level":1,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}
{"reqId":"5445495d9f4ec","app":"PHP","message":"Cannot redeclare class OC\HTTPHelper at /home/deo/public_html/oc6/lib/private/httphelper.php#11","level":3,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}

Member

VicDeo commented Oct 20, 2014

Both 3rdparty and core upgrade are passed smoothly and it happens before upgrading apps:

{"reqId":"5445495d9f4ec","app":"updater","message":"Success: 3rdparty","level":1,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}
{"reqId":"5445495d9f4ec","app":"updater","message":"Success: core","level":1,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}
{"reqId":"5445495d9f4ec","app":"PHP","message":"Cannot redeclare class OC\HTTPHelper at /home/deo/public_html/oc6/lib/private/httphelper.php#11","level":3,"time":"2014-10-20T17:41:49+00:00","method":"POST","url":"/~deo/oc6/index.php/apps/updater/ajax/update.php"}

@VicDeo

This comment has been minimized.

Show comment
Hide comment
@VicDeo

VicDeo Oct 20, 2014

Member

So... should I write own ownCloud API inside Updater to read nothing but shipped tag?

The flow is as follows:

  1. Class calls \OC_App::isShipped while updating the apps https://github.com/owncloud/updater/blob/master/lib/location/apps.php#L66
  2. In case the app is not loaded yet, \OC_App loads the app
  3. While loading the app it tries to fetch a link content to the app docs.
  4. It executes if(!\OC::$server->getHTTPHelper()->isHTTPURL($url)) { to check whether the URL content safe
  5. HTTPHelper class is loaded twice for some reason
  6. Pimple dies on the very last line of the offsetGet method with Cannot redeclare class OC\HTTPHelper message
  7. Server responds 500

it happens for files_encryption app since it is not loaded and has a link to docs inside info.xml

Member

VicDeo commented Oct 20, 2014

So... should I write own ownCloud API inside Updater to read nothing but shipped tag?

The flow is as follows:

  1. Class calls \OC_App::isShipped while updating the apps https://github.com/owncloud/updater/blob/master/lib/location/apps.php#L66
  2. In case the app is not loaded yet, \OC_App loads the app
  3. While loading the app it tries to fetch a link content to the app docs.
  4. It executes if(!\OC::$server->getHTTPHelper()->isHTTPURL($url)) { to check whether the URL content safe
  5. HTTPHelper class is loaded twice for some reason
  6. Pimple dies on the very last line of the offsetGet method with Cannot redeclare class OC\HTTPHelper message
  7. Server responds 500

it happens for files_encryption app since it is not loaded and has a link to docs inside info.xml

@VicDeo

This comment has been minimized.

Show comment
Hide comment
@VicDeo

VicDeo Oct 20, 2014

Member

👍 Works as expected with #45

Member

VicDeo commented Oct 20, 2014

👍 Works as expected with #45

@VicDeo VicDeo reopened this Oct 20, 2014

VicDeo added a commit that referenced this pull request Oct 20, 2014

Merge pull request #41 from owncloud/fix-styling-stable7
Improve updater style to match ownCloud core styles + fixing typos and c...

@VicDeo VicDeo merged commit cbbd6fb into stable7 Oct 20, 2014

1 check was pending

continuous-integration/travis-ci The Travis CI build is in progress
Details

@VicDeo VicDeo deleted the fix-styling-stable7 branch Oct 20, 2014

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