Skip to content

Commit

Permalink
Revert "New Media Manager Upstream Merge (joomla#18)" (joomla#19)
Browse files Browse the repository at this point in the history 
This reverts commit 28dfe8a.
  • Loading branch information
@kasvith
kasvith authored Aug 18, 2018
1 parent 28dfe8a commit 77609e7
Show file tree
Hide file tree
Showing 3,988 changed files with 419,247 additions and 87,460 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
30 changes: 7 additions & 23 deletions .drone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,15 @@ pipeline:
- /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --encoding=utf-8 --standard=build/phpcs/Joomla .
- echo $(date)

restore-cache:
image: drillster/drone-volume-cache
restore: true
mount:
- ./node_modules
- ./libraries/vendor
volumes:
- /tmp/cache:/cache

prepare:
image: joomlaprojects/docker-tools:develop
initdb:
image: joomlaprojects/docker-php70:develop
commands:
- composer install --no-progress --no-suggest
# needed for unit testing
- composer update joomla/test-unit --no-progress --no-suggest
# needed for system testing
- composer update joomla/test-system --no-progress --no-suggest
- composer update joomla-projects/selenium-server-standalone --no-progress --no-suggest
- npm install --unsafe-perm

rebuild-cache:
image: drillster/drone-volume-cache
rebuild: true
mount:
- ./node_modules
- ./libraries/vendor
volumes:
- /tmp/cache:/cache

php70-unit:
group: unit
Expand All @@ -58,16 +39,19 @@ pipeline:
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist

javascript:
image: joomlaprojects/docker-systemtests:develop
image: joomlaprojects/docker-systemtests:latest
commands:
- ln -s /usr/bin/nodejs /usr/bin/node
- export DISPLAY=:0
- Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
- sleep 3
- mv -f drone-package.json package.json
- fluxbox > /dev/null 2>&1 &
- npm install
- node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run

system-tests:
image: joomlaprojects/docker-systemtests:develop
image: joomlaprojects/docker-systemtests:latest
commands:
- bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"

Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A list of files to ignore from linting
# TODO: Fix the webcomponents codestyle then also allow linting on them
*.js
!*.es6.js
!build/**/*.js
*.vue
186 changes: 174 additions & 12 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,16 @@

# Test Related Files #
/phpunit.xml
selenium.log
composer.phar
/test-install


# Vendor directory handeling
/libraries/vendor
!libraries/vendor/.gitkeep

/media/vendor
!media/vendor/.gitkeep

# Stubs file holding mapped classes
/stubs.php

# JS/CSS Build #
# Grunt #
node_modules/
/build/assets_tmp
/scss-lint-report.xml
/dev/assets/packages.json
yarn.lock

# Removed in Joomla 4 #
administrator/templates/isis
Expand Down Expand Up @@ -86,7 +77,178 @@ Desktop.ini
# Only apply this rule to the main repository's gitignore files
!/.gitignore
!/build/.gitignore
!/tests/unit/suites/libraries/joomla/archive/.gitignore
!/tests/unit/tmp/.gitignore

# Extra files installed by Composer not needed in the CMS environment
# This should only ignore files like unit testing or READMEs, production
# code must remain to ensure all libraries properly function
/libraries/vendor/fig/link-util/test
/libraries/vendor/fig/link-util/composer.json
/libraries/vendor/fig/link-util/phpcs.xml
/libraries/vendor/fig/link-util/README.md
/libraries/vendor/ircmaxell/password-compat/test
/libraries/vendor/ircmaxell/password-compat/.travis.yml
/libraries/vendor/ircmaxell/password-compat/composer.json
/libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
/libraries/vendor/ircmaxell/password-compat/README.md
/libraries/vendor/ircmaxell/password-compat/version-test.php
/libraries/vendor/composer/ca-bundle/composer.json
/libraries/vendor/composer/ca-bundle/README.md
/libraries/vendor/defuse/php-encryption/dist
/libraries/vendor/defuse/php-encryption/docs
/libraries/vendor/defuse/php-encryption/test
/libraries/vendor/defuse/php-encryption/.gitignore
/libraries/vendor/defuse/php-encryption/.php_cs
/libraries/vendor/defuse/php-encryption/composer.json
/libraries/vendor/defuse/php-encryption/README.md
/libraries/vendor/defuse/php-encryption/psalm.xml
/libraries/vendor/defuse/php-encryption/test.sh
/libraries/vendor/doctrine/inflector/composer.json
/libraries/vendor/doctrine/inflector/README.md
/libraries/vendor/google/recaptcha/examples
/libraries/vendor/google/recaptcha/tests
/libraries/vendor/google/recaptcha/.gitignore
/libraries/vendor/google/recaptcha/.travis.yml
/libraries/vendor/google/recaptcha/composer.json
/libraries/vendor/google/recaptcha/CONTRIBUTING.md
/libraries/vendor/google/recaptcha/phpunit.xml.dist
/libraries/vendor/google/recaptcha/README.md
/libraries/vendor/joomla/*/.appveyor.yml
/libraries/vendor/joomla/*/.gitattributes
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/.travis/
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/libraries/vendor/joomla/*/tests
/libraries/vendor/joomla/*/vendor
/libraries/vendor/joomla/*/.scrutinizer.yml
/libraries/vendor/joomla/*/.travis.yml
/libraries/vendor/joomla/*/CONTRIBUTING.md
/libraries/vendor/joomla/*/composer.json
/libraries/vendor/joomla/*/phpunit.xml.dist
/libraries/vendor/joomla/*/phpunit.travis.xml
/libraries/vendor/joomla/*/phpunit.appveyor.xml
/libraries/vendor/joomla/*/README.md
/libraries/vendor/joomla/*/ruleset.xml
/libraries/vendor/leafo/lessphp/docs
/libraries/vendor/leafo/lessphp/tests
/libraries/vendor/leafo/lessphp/.gitignore
/libraries/vendor/leafo/lessphp/.travis.yml
/libraries/vendor/leafo/lessphp/composer.json
/libraries/vendor/leafo/lessphp/Makefile
/libraries/vendor/leafo/lessphp/package.sh
/libraries/vendor/leafo/lessphp/README.md
/libraries/vendor/mso/idna-convert/.gitattributes
/libraries/vendor/mso/idna-convert/.gitignore
/libraries/vendor/mso/idna-convert/composer.json
/libraries/vendor/mso/idna-convert/README.md
/libraries/vendor/paragonie/random_compat/.gitignore
/libraries/vendor/paragonie/random_compat/.scrutinizer.yml
/libraries/vendor/paragonie/random_compat/.travis.yml
/libraries/vendor/paragonie/random_compat/dist
/libraries/vendor/paragonie/random_compat/other
/libraries/vendor/paragonie/random_compat/CHANGELOG.md
/libraries/vendor/paragonie/random_compat/ERRATA.md
/libraries/vendor/paragonie/random_compat/RATIONALE.md
/libraries/vendor/paragonie/random_compat/README.md
/libraries/vendor/paragonie/random_compat/SECURITY.md
/libraries/vendor/paragonie/random_compat/build-phar.sh
/libraries/vendor/paragonie/random_compat/composer.json
/libraries/vendor/paragonie/random_compat/psalm-autoload.php
/libraries/vendor/paragonie/random_compat/psalm.xml
/libraries/vendor/paragonie/random_compat/tests
/libraries/vendor/paragonie/sodium_compat/dist
/libraries/vendor/paragonie/sodium_compat/.gitignore
/libraries/vendor/paragonie/sodium_compat/appveyor.yml
/libraries/vendor/paragonie/sodium_compat/build-phar.sh
/libraries/vendor/paragonie/sodium_compat/composer.json
/libraries/vendor/paragonie/sodium_compat/composer.lock
/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
/libraries/vendor/paragonie/sodium_compat/README.md
/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
/libraries/vendor/phpmailer/phpmailer/docs
/libraries/vendor/phpmailer/phpmailer/examples
/libraries/vendor/phpmailer/phpmailer/language
/libraries/vendor/phpmailer/phpmailer/test
/libraries/vendor/phpmailer/phpmailer/.github
/libraries/vendor/phpmailer/phpmailer/.gitignore
/libraries/vendor/phpmailer/phpmailer/.phan
/libraries/vendor/phpmailer/phpmailer/.php_cs
/libraries/vendor/phpmailer/phpmailer/.scrutinizer.yml
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/composer.lock
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/SECURITY.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
/libraries/vendor/psr/container/.gitignore
/libraries/vendor/psr/container/composer.json
/libraries/vendor/psr/container/README.md
/libraries/vendor/psr/http-message/CHANGELOG.md
/libraries/vendor/psr/http-message/composer.json
/libraries/vendor/psr/http-message/README.md
/libraries/vendor/psr/link/composer.json
/libraries/vendor/psr/link/README.md
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
/libraries/vendor/psr/log/README.md
/libraries/vendor/symfony/*/Tests
/libraries/vendor/symfony/*/.gitignore
/libraries/vendor/symfony/*/CHANGELOG.md
/libraries/vendor/symfony/*/composer.json
/libraries/vendor/symfony/*/phpunit.xml.dist
/libraries/vendor/symfony/*/README.md
/libraries/vendor/symfony/console/Resources/bin/hiddeninput.exe
/libraries/vendor/symfony/debug/Resources/ext
/libraries/vendor/symfony/polyfill-util/TestListener.php
/libraries/vendor/simplepie/simplepie/demo
/libraries/vendor/simplepie/simplepie/tests
/libraries/vendor/simplepie/simplepie/README.markdown
/libraries/vendor/simplepie/simplepie/phpunit.xml.dist
/libraries/vendor/simplepie/simplepie/.gitignore
/libraries/vendor/simplepie/simplepie/.travis.yml
/libraries/vendor/simplepie/simplepie/compatibility_test
/libraries/vendor/simplepie/simplepie/build
/libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
/libraries/vendor/simplepie/simplepie/composer.json
/libraries/vendor/wamania/php-stemmer/.gitignore
/libraries/vendor/wamania/php-stemmer/README.md
/libraries/vendor/wamania/php-stemmer/composer.json
/libraries/vendor/wamania/php-stemmer/phpunit.xml.dist
/libraries/vendor/wamania/php-stemmer/test
/libraries/vendor/zendframework/zend-diactoros/.coveralls.yml
/libraries/vendor/zendframework/zend-diactoros/CHANGELOG.md
/libraries/vendor/zendframework/zend-diactoros/composer.json
/libraries/vendor/zendframework/zend-diactoros/composer.lock
/libraries/vendor/zendframework/zend-diactoros/CONDUCT.md
/libraries/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
/libraries/vendor/zendframework/zend-diactoros/mkdocs.yml
/libraries/vendor/zendframework/zend-diactoros/README.md

# System Test related files
/libraries/vendor/codeception
/libraries/vendor/behat
/libraries/vendor/consolidation
/libraries/vendor/joomla/test-system
/libraries/vendor/league/
/libraries/vendor/phpdocumentor/
/libraries/vendor/phpspec/
/libraries/vendor/phpunit/
/libraries/vendor/sebastian/
/libraries/vendor/squizlabs/

selenium.log
composer.phar
/test-install

# Build related
RoboFile.ini
Expand Down
25 changes: 0 additions & 25 deletions Gemfile.lock
View file

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm

Build Status
---------------------
| Travis-CI | Drone-CI | AppVeyor |
| ------------- | ------------- | ------------- |
| [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms) | [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms) |
| Travis-CI | Drone-CI | AppVeyor | Jenkins |
| ------------- | ------------- | ------------- | ------------- |
| [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms) | [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms) | [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/) |

What is this?
---------------------
Expand Down
4 changes: 2 additions & 2 deletions RoboFile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
*
* @param array $opts Additional options
*
* @since 4.0.0
* @since __DEPLOY_VERSION__
*
* @return void
*/
Expand All @@ -285,7 +285,7 @@ public function runInstall($opts = ['use-htaccess' => false, 'env' => 'desktop']
*
* @return string Path to codeception
*
* @since 4.0.0
* @since __DEPLOY_VERSION__
*/
protected function prepareRun($opts = ['use-htaccess' => false, 'env' => 'desktop'])
{
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_admin/Controller/DisplayController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

namespace Joomla\Component\Admin\Administrator\Controller;

defined('_JEXEC') or die;
Expand Down
8 changes: 3 additions & 5 deletions administrator/components/com_admin/Controller/ProfileController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

namespace Joomla\Component\Admin\Administrator\Controller;

defined('_JEXEC') or die;

use Joomla\CMS\MVC\Controller\FormController;
use Joomla\CMS\Router\Route;

/**
* User profile controller class.
Expand Down Expand Up @@ -50,14 +48,14 @@ protected function allowEdit($data = array(), $key = 'id')
*/
public function save($key = null, $urlVar = null)
{
$this->setRedirect(Route::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->app->getIdentity()->id, false));
$this->setRedirect(\JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->app->getIdentity()->id, false));

$return = parent::save();

if ($this->getTask() != 'apply')
{
// Redirect to the main page.
$this->setRedirect(Route::_('index.php', false));
$this->setRedirect(\JRoute::_('index.php', false));
}

return $return;
Expand All @@ -77,7 +75,7 @@ public function cancel($key = null)
$return = parent::cancel($key);

// Redirect to the main page.
$this->setRedirect(Route::_('index.php', false));
$this->setRedirect(\JRoute::_('index.php', false));

return $return;
}
Expand Down
Loading

0 comments on commit 77609e7

Please sign in to comment.