Skip to content
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

[3.x] Correct the use of the use command and move it below the defined command #20130

Merged
merged 1 commit into from
Apr 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/joomla/controller/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
* @license GNU General Public License version 2 or later; see LICENSE
*/

use Joomla\Application\AbstractApplication;

defined('JPATH_PLATFORM') or die;

use Joomla\Application\AbstractApplication;

/**
* Joomla Platform Controller Interface
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Authentication/Authentication.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Authentication;

use Joomla\CMS\Plugin\PluginHelper;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Plugin\PluginHelper;

/**
* Authentication class, provides an interface for the Joomla authentication system
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Cache/CacheStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Cache;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Cache\Exception\UnsupportedCacheException;
use Joomla\CMS\Log\Log;

defined('JPATH_PLATFORM') or die;

/**
* Abstract cache storage handler
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Component\Exception;

use Joomla\CMS\Router\Exception\RouteNotFoundException;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Router\Exception\RouteNotFoundException;

/**
* Exception class defining an error for a missing component
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Crypt/Crypt.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Crypt;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Crypt\Cipher\SimpleCipher;
use Joomla\CMS\Log\Log;

defined('JPATH_PLATFORM') or die;

/**
* Crypt is a Joomla Platform class for handling basic encryption/decryption of data.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Feed/Feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Feed;

use Joomla\CMS\Date\Date;

defined('JPATH_PLATFORM') or die();

use Joomla\CMS\Date\Date;

/**
* Class to encapsulate a feed for the Joomla Platform.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Feed/FeedEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Feed;

use Joomla\CMS\Date\Date;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Date\Date;

/**
* Class to encapsulate a feed entry for the Joomla Platform.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Feed/FeedParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Feed;

use Joomla\CMS\Feed\Parser\NamespaceParserInterface;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Feed\Parser\NamespaceParserInterface;

/**
* Feed Parser class.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Helper/ContentHistoryHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Helper;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Table\Table;

defined('JPATH_PLATFORM') or die;

/**
* Versions helper class, provides methods to perform various tasks relevant
* versioning of content.
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Input/Json.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Input;

use Joomla\CMS\Filter\InputFilter;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Filter\InputFilter;

/**
* Joomla! Input JSON Class
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Installer/Installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

namespace Joomla\CMS\Installer;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Application\ApplicationHelper;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Table\Extension;
use Joomla\CMS\Table\Table;

defined('JPATH_PLATFORM') or die;

\JLoader::import('joomla.filesystem.file');
\JLoader::import('joomla.filesystem.folder');
\JLoader::import('joomla.filesystem.path');
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Installer/InstallerAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

namespace Joomla\CMS\Installer;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Installer\Manifest\PackageManifest;
use Joomla\CMS\Table\Extension;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Table\TableInterface;

defined('JPATH_PLATFORM') or die;

\JLoader::import('joomla.base.adapterinstance');

/**
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Language/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

namespace Joomla\CMS\Language;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Log\Log;

defined('JPATH_PLATFORM') or die;

/**
* Text handling class.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Layout/FileLayout.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Layout;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Application\ApplicationHelper;
use Joomla\CMS\Component\ComponentHelper;

defined('JPATH_PLATFORM') or die;

/**
* Base class for rendering a display layout
* loaded from from a layout file
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Mail/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Mail;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Log\Log;

defined('JPATH_PLATFORM') or die;

/**
* Email Class. Provides a common interface to send email from the Joomla! Platform
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Table/Observer/AbstractObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace Joomla\CMS\Table\Observer;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Table\TableInterface;
use Joomla\CMS\Table\Table;

defined('JPATH_PLATFORM') or die;

/**
* Table class supporting modified pre-order tree traversal behavior.
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Toolbar/Toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Toolbar;

use Joomla\CMS\Layout\FileLayout;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Layout\FileLayout;

/**
* ToolBar handler
*
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Toolbar/ToolbarButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace Joomla\CMS\Toolbar;

use Joomla\CMS\Layout\FileLayout;

defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Layout\FileLayout;

/**
* Button base class
*
Expand Down