diff --git a/buena/functions.php b/buena/functions.php index b50f667..ac7df51 100644 --- a/buena/functions.php +++ b/buena/functions.php @@ -33,7 +33,7 @@ if ( ! function_exists( 'trigger_pfadfinden_plugin_error' ) ) { // Check for suitable environment if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID >= 50400 ) { // Register autoloader if updater plugin missing - if ( ! class_exists( 'Shy\WordPress\Theme' ) ) { + if ( ! class_exists( 'plugins\buena\use\shy-wordpress\src\Shy\WordPress\Theme' ) ) { if ( ! include_once __DIR__ . '/use/shy-wordpress/src/autoloader.php' ) { trigger_pfadfinden_plugin_error( __( 'Das Theme ist unvollständig und konnte nicht geladen werden. Neuinstallation müsste helfen.', 'buena-theme' ), @@ -53,13 +53,13 @@ if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID >= 50400 ) { } /** - * @return \Pfadfinden\WordPress\BuenaTheme + * @return \plugins\buena\src\Pfadfinden\WordPress\BuenaTheme */ function buena_get_theme() { static $theme = null; if (!$theme) { - $theme = new ReflectionClass( 'Pfadfinden\WordPress\BuenaTheme' ); + $theme = new ReflectionClass( 'plugins\buena\src\Pfadfinden\WordPress\BuenaTheme' ); $theme = $theme->newInstance(); } diff --git a/buena/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php b/buena/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php index 2e07fe2..3bba6ec 100644 --- a/buena/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php +++ b/buena/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php @@ -1,10 +1,10 @@ getMockBuilder( 'Shy\WordPress\SettingsPage' ) + $builder = $this->getMockBuilder( 'plugins\buena\use\shy-wordpress\src\Shy\WordPress\SettingsPage' ) ->enableProxyingToOriginalMethods(); if ( null === $slug ) { @@ -37,10 +38,10 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test reading defaults from the settings page. * - * @covers SettingsPage::__construct() - * @covers SettingsPage::getDefaults() - * @covers SettingsPage::offsetExists() - * @covers SettingsPage::offsetGet() + * @covers wordpress\src\Shy\WordPress\SettingsPage::__construct() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getDefaults() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetExists() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetGet() * @expectedException OutOfBoundsException */ public function testReading() @@ -63,7 +64,7 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test writing to the settings page. * - * @covers SettingsPage::offsetSet() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetSet() * @expectedException OutOfBoundsException */ public function testWriting() @@ -100,10 +101,10 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test whether the settings page can be showed. * - * @covers SettingsPage::__construct() - * @covers SettingsPage::getParentSlug() - * @covers SettingsPage::getPageTitle() - * @covers SettingsPage::getMenuTitle() + * @covers wordpress\src\Shy\WordPress\SettingsPage::__construct() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getParentSlug() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getPageTitle() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getMenuTitle() */ public function testRegisterPage() { @@ -124,7 +125,7 @@ class SettingsPageTest extends \WP_UnitTestCase /** - * @covers SettingsPage::sanitizeOptions() + * @covers wordpress\src\Shy\WordPress\SettingsPage::sanitizeOptions() */ public function testSanitize() { diff --git a/buena/editor-style.css b/plugins/buena/editor-style.css similarity index 100% rename from buena/editor-style.css rename to plugins/buena/editor-style.css diff --git a/buena/font/ihs.css b/plugins/buena/font/ihs.css similarity index 100% rename from buena/font/ihs.css rename to plugins/buena/font/ihs.css diff --git a/buena/font/ihs.eot b/plugins/buena/font/ihs.eot similarity index 100% rename from buena/font/ihs.eot rename to plugins/buena/font/ihs.eot diff --git a/buena/font/ihs.svg b/plugins/buena/font/ihs.svg similarity index 100% rename from buena/font/ihs.svg rename to plugins/buena/font/ihs.svg diff --git a/buena/font/ihs.ttf b/plugins/buena/font/ihs.ttf similarity index 100% rename from buena/font/ihs.ttf rename to plugins/buena/font/ihs.ttf diff --git a/buena/font/ihs.woff b/plugins/buena/font/ihs.woff similarity index 100% rename from buena/font/ihs.woff rename to plugins/buena/font/ihs.woff diff --git a/buena/font/ihs.woff2 b/plugins/buena/font/ihs.woff2 similarity index 100% rename from buena/font/ihs.woff2 rename to plugins/buena/font/ihs.woff2 diff --git a/buena/img/BDP001_Icon_Empfehlen.png b/plugins/buena/img/BDP001_Icon_Empfehlen.png similarity index 100% rename from buena/img/BDP001_Icon_Empfehlen.png rename to plugins/buena/img/BDP001_Icon_Empfehlen.png diff --git a/buena/img/bleistift.png b/plugins/buena/img/bleistift.png similarity index 100% rename from buena/img/bleistift.png rename to plugins/buena/img/bleistift.png diff --git a/buena/img/briefumschlag.png b/plugins/buena/img/briefumschlag.png similarity index 100% rename from buena/img/briefumschlag.png rename to plugins/buena/img/briefumschlag.png diff --git a/buena/img/bundeszeichen.png b/plugins/buena/img/bundeszeichen.png similarity index 100% rename from buena/img/bundeszeichen.png rename to plugins/buena/img/bundeszeichen.png diff --git a/buena/img/bundeszeichen@2x.png b/plugins/buena/img/bundeszeichen@2x.png similarity index 100% rename from buena/img/bundeszeichen@2x.png rename to plugins/buena/img/bundeszeichen@2x.png diff --git a/buena/img/deutschlandkarte.png b/plugins/buena/img/deutschlandkarte.png similarity index 100% rename from buena/img/deutschlandkarte.png rename to plugins/buena/img/deutschlandkarte.png diff --git a/buena/img/favicon.ico b/plugins/buena/img/favicon.ico similarity index 100% rename from buena/img/favicon.ico rename to plugins/buena/img/favicon.ico diff --git a/buena/img/hamburger.png b/plugins/buena/img/hamburger.png similarity index 100% rename from buena/img/hamburger.png rename to plugins/buena/img/hamburger.png diff --git a/buena/img/holz.jpg b/plugins/buena/img/holz.jpg similarity index 100% rename from buena/img/holz.jpg rename to plugins/buena/img/holz.jpg diff --git a/buena/img/icon-drucken.png b/plugins/buena/img/icon-drucken.png similarity index 100% rename from buena/img/icon-drucken.png rename to plugins/buena/img/icon-drucken.png diff --git a/buena/img/icon-favoriten.png b/plugins/buena/img/icon-favoriten.png similarity index 100% rename from buena/img/icon-favoriten.png rename to plugins/buena/img/icon-favoriten.png diff --git a/buena/img/icon-impressum.png b/plugins/buena/img/icon-impressum.png similarity index 100% rename from buena/img/icon-impressum.png rename to plugins/buena/img/icon-impressum.png diff --git a/buena/img/icon-kontakt.png b/plugins/buena/img/icon-kontakt.png similarity index 100% rename from buena/img/icon-kontakt.png rename to plugins/buena/img/icon-kontakt.png diff --git a/buena/img/klufthemd.png b/plugins/buena/img/klufthemd.png similarity index 100% rename from buena/img/klufthemd.png rename to plugins/buena/img/klufthemd.png diff --git a/buena/img/leitbild_Kontakt_low.jpg b/plugins/buena/img/leitbild_Kontakt_low.jpg similarity index 100% rename from buena/img/leitbild_Kontakt_low.jpg rename to plugins/buena/img/leitbild_Kontakt_low.jpg diff --git a/buena/img/leitbild_Kontakt_low_klein.jpg b/plugins/buena/img/leitbild_Kontakt_low_klein.jpg similarity index 100% rename from buena/img/leitbild_Kontakt_low_klein.jpg rename to plugins/buena/img/leitbild_Kontakt_low_klein.jpg diff --git a/buena/img/leitbild_aktionen_low.jpg b/plugins/buena/img/leitbild_aktionen_low.jpg similarity index 100% rename from buena/img/leitbild_aktionen_low.jpg rename to plugins/buena/img/leitbild_aktionen_low.jpg diff --git a/buena/img/leitbild_aktionen_low_klein.jpg b/plugins/buena/img/leitbild_aktionen_low_klein.jpg similarity index 100% rename from buena/img/leitbild_aktionen_low_klein.jpg rename to plugins/buena/img/leitbild_aktionen_low_klein.jpg diff --git a/buena/img/leitbild_bund.jpg b/plugins/buena/img/leitbild_bund.jpg similarity index 100% rename from buena/img/leitbild_bund.jpg rename to plugins/buena/img/leitbild_bund.jpg diff --git a/buena/img/leitbild_bund_crop.jpg b/plugins/buena/img/leitbild_bund_crop.jpg similarity index 100% rename from buena/img/leitbild_bund_crop.jpg rename to plugins/buena/img/leitbild_bund_crop.jpg diff --git a/buena/img/leitbild_bund_crop_klein.jpg b/plugins/buena/img/leitbild_bund_crop_klein.jpg similarity index 100% rename from buena/img/leitbild_bund_crop_klein.jpg rename to plugins/buena/img/leitbild_bund_crop_klein.jpg diff --git a/buena/img/leitbild_ihs.jpg b/plugins/buena/img/leitbild_ihs.jpg similarity index 100% rename from buena/img/leitbild_ihs.jpg rename to plugins/buena/img/leitbild_ihs.jpg diff --git a/buena/img/leitbild_ihs_klein.jpg b/plugins/buena/img/leitbild_ihs_klein.jpg similarity index 100% rename from buena/img/leitbild_ihs_klein.jpg rename to plugins/buena/img/leitbild_ihs_klein.jpg diff --git a/buena/img/leitbild_int2_low.jpg b/plugins/buena/img/leitbild_int2_low.jpg similarity index 100% rename from buena/img/leitbild_int2_low.jpg rename to plugins/buena/img/leitbild_int2_low.jpg diff --git a/buena/img/leitbild_int2_low_klein.jpg b/plugins/buena/img/leitbild_int2_low_klein.jpg similarity index 100% rename from buena/img/leitbild_int2_low_klein.jpg rename to plugins/buena/img/leitbild_int2_low_klein.jpg diff --git a/buena/img/leitbild_pfadfinden_low.jpg b/plugins/buena/img/leitbild_pfadfinden_low.jpg similarity index 100% rename from buena/img/leitbild_pfadfinden_low.jpg rename to plugins/buena/img/leitbild_pfadfinden_low.jpg diff --git a/buena/img/leitbild_pfadfinden_low_klein.jpg b/plugins/buena/img/leitbild_pfadfinden_low_klein.jpg similarity index 100% rename from buena/img/leitbild_pfadfinden_low_klein.jpg rename to plugins/buena/img/leitbild_pfadfinden_low_klein.jpg diff --git a/buena/img/loeffel-topf.png b/plugins/buena/img/loeffel-topf.png similarity index 100% rename from buena/img/loeffel-topf.png rename to plugins/buena/img/loeffel-topf.png diff --git a/buena/img/lupe.svg b/plugins/buena/img/lupe.svg similarity index 100% rename from buena/img/lupe.svg rename to plugins/buena/img/lupe.svg diff --git a/buena/img/schatten.svg b/plugins/buena/img/schatten.svg similarity index 100% rename from buena/img/schatten.svg rename to plugins/buena/img/schatten.svg diff --git a/buena/img/streichholzschachtel.png b/plugins/buena/img/streichholzschachtel.png similarity index 100% rename from buena/img/streichholzschachtel.png rename to plugins/buena/img/streichholzschachtel.png diff --git a/buena/readme.txt b/plugins/buena/readme.txt similarity index 100% rename from buena/readme.txt rename to plugins/buena/readme.txt diff --git a/buena/screenshot.png b/plugins/buena/screenshot.png similarity index 100% rename from buena/screenshot.png rename to plugins/buena/screenshot.png diff --git a/buena/src/Pfadfinden/WordPress/BuenaSettings.php b/plugins/buena/src/Pfadfinden/WordPress/BuenaSettings.php similarity index 50% rename from buena/src/Pfadfinden/WordPress/BuenaSettings.php rename to plugins/buena/src/Pfadfinden/WordPress/BuenaSettings.php index e7ad629..fca9537 100644 --- a/buena/src/Pfadfinden/WordPress/BuenaSettings.php +++ b/plugins/buena/src/Pfadfinden/WordPress/BuenaSettings.php @@ -1,12 +1,13 @@ settings ); } diff --git a/buena/style.css b/plugins/buena/style.css similarity index 100% rename from buena/style.css rename to plugins/buena/style.css diff --git a/buena/use/shy-wordpress/.gitignore b/plugins/buena/use/shy-wordpress/.gitignore similarity index 100% rename from buena/use/shy-wordpress/.gitignore rename to plugins/buena/use/shy-wordpress/.gitignore diff --git a/buena/use/shy-wordpress/phpunit.xml.dist b/plugins/buena/use/shy-wordpress/phpunit.xml.dist similarity index 100% rename from buena/use/shy-wordpress/phpunit.xml.dist rename to plugins/buena/use/shy-wordpress/phpunit.xml.dist diff --git a/plugins/pfadfinden-theme-updater/pfadfinden-theme-updater.php b/plugins/pfadfinden-theme-updater/pfadfinden-theme-updater.php index 272d944..0514909 100644 --- a/plugins/pfadfinden-theme-updater/pfadfinden-theme-updater.php +++ b/plugins/pfadfinden-theme-updater/pfadfinden-theme-updater.php @@ -63,7 +63,7 @@ if ( ! function_exists( 'trigger_pfadfinden_plugin_error' ) ) { // Check for suitable environment if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID >= 50400 ) { // If we’re the first user of the library, use the bundled one - if ( ! class_exists( 'Shy\WordPress\Plugin' ) ) { + if ( ! class_exists( 'plugins\buena\use\shy-wordpress\src\Shy\WordPress\Plugin' ) ) { pfadfinden_theme_updater_load_textdomain(); if ( ! include_once __DIR__ . '/use/shy-wordpress/src/autoloader.php' ) { trigger_pfadfinden_plugin_error( diff --git a/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterPlugin.php b/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterPlugin.php index c4e54f9..6266ae1 100644 --- a/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterPlugin.php +++ b/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterPlugin.php @@ -2,7 +2,7 @@ namespace Pfadfinden\WordPress; -use Shy\WordPress\Plugin; +use wordpress\src\Shy\WordPress\Plugin; @@ -13,7 +13,7 @@ use Shy\WordPress\Plugin; * * @author Philipp Cordes */ -class ThemeUpdaterPlugin extends Plugin +class ThemeUpdaterPlugin extends wordpress\src\Shy\WordPress\Plugin { const ACTION_QUERY_THEMES = 'query_themes'; const ACTION_FEATURE_LIST = 'feature_list'; diff --git a/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterSettings.php b/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterSettings.php index 890b977..6bbe2ec 100644 --- a/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterSettings.php +++ b/plugins/pfadfinden-theme-updater/src/Pfadfinden/WordPress/ThemeUpdaterSettings.php @@ -2,7 +2,7 @@ namespace Pfadfinden\WordPress; -use Shy\WordPress\SettingsPage; +use wordpress\src\Shy\WordPress\SettingsPage; @@ -11,7 +11,7 @@ use Shy\WordPress\SettingsPage; * * @author Philipp Cordes */ -class ThemeUpdaterSettings extends SettingsPage +class ThemeUpdaterSettings extends wordpress\src\Shy\WordPress\SettingsPage { /** * Full path of plugin main file. diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php index 2e07fe2..ba142de 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/CompositeOption.php @@ -4,7 +4,7 @@ namespace Shy\WordPress; -/** +use plugins\buena\use\shy/** * A composite option with a fixed number of suboptions and their default values. */ abstract class CompositeOption implements \ArrayAccess, \Countable, \IteratorAggregate diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Plugin.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Plugin.php index 31ee602..303528e 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Plugin.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Plugin.php @@ -4,7 +4,7 @@ namespace Shy\WordPress; -/** +use plugins\buena\use\shy/** * Marker class for WordPress plugins. */ abstract class Plugin diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/SettingsPage.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/SettingsPage.php index 3dadfe2..0063733 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/SettingsPage.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/SettingsPage.php @@ -4,7 +4,7 @@ namespace Shy\WordPress; -/** +use plugins\buena\use\shyuse plugins\buena\use\shy/** * Abstracts common functionality and escaping for the Settings API. * * TODO: Check slug and field names for illegal characters. diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Theme.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Theme.php index d1a2992..e7fa341 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Theme.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/src/Shy/WordPress/Theme.php @@ -4,7 +4,7 @@ namespace Shy\WordPress; -abstract class Theme extends Plugin +use plugins\buena\use\shyabstract class Theme extends Plugin { public function __construct() { diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/HookableTraitTest.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/HookableTraitTest.php index 7241a43..3ee980c 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/HookableTraitTest.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/HookableTraitTest.php @@ -2,7 +2,7 @@ namespace Shy\WordPress\Tests; -use Shy\WordPress\HookableTrait; +use wordpress\src\Shy\WordPress\HookableTrait; diff --git a/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/SettingsPageTest.php b/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/SettingsPageTest.php index 276fb34..7f11e72 100644 --- a/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/SettingsPageTest.php +++ b/plugins/pfadfinden-theme-updater/use/shy-wordpress/tests/Shy/WordPress/Tests/SettingsPageTest.php @@ -2,7 +2,7 @@ namespace Shy\WordPress\Tests; -use Shy\WordPress\SettingsPage; +use wordpress\src\Shy\WordPress\SettingsPage; use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit_Framework_MockObject_Builder_InvocationMocker as BuilderInvocationMocker; @@ -15,13 +15,14 @@ class SettingsPageTest extends \WP_UnitTestCase * * @param string|null $slug * @param string $capability - * @return SettingsPage|MockObject { + * + * @return wordpress\src\Shy\WordPress\SettingsPage|MockObject { * @method BuilderInvocationMocker method(string) * } */ protected function mockSettingsPage( $slug = null, $capability = 'manage_options' ) { - $builder = $this->getMockBuilder( 'Shy\WordPress\SettingsPage' ) + $builder = $this->getMockBuilder( 'plugins\buena\use\shy-wordpress\src\Shy\WordPress\SettingsPage' ) ->enableProxyingToOriginalMethods(); if ( null === $slug ) { @@ -37,10 +38,10 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test reading defaults from the settings page. * - * @covers SettingsPage::__construct() - * @covers SettingsPage::getDefaults() - * @covers SettingsPage::offsetExists() - * @covers SettingsPage::offsetGet() + * @covers wordpress\src\Shy\WordPress\SettingsPage::__construct() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getDefaults() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetExists() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetGet() * @expectedException OutOfBoundsException */ public function testReading() @@ -63,7 +64,7 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test writing to the settings page. * - * @covers SettingsPage::offsetSet() + * @covers wordpress\src\Shy\WordPress\SettingsPage::offsetSet() * @expectedException OutOfBoundsException */ public function testWriting() @@ -100,10 +101,10 @@ class SettingsPageTest extends \WP_UnitTestCase /** * Test whether the settings page can be showed. * - * @covers SettingsPage::__construct() - * @covers SettingsPage::getParentSlug() - * @covers SettingsPage::getPageTitle() - * @covers SettingsPage::getMenuTitle() + * @covers wordpress\src\Shy\WordPress\SettingsPage::__construct() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getParentSlug() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getPageTitle() + * @covers wordpress\src\Shy\WordPress\SettingsPage::getMenuTitle() */ public function testRegisterPage() { @@ -124,7 +125,7 @@ class SettingsPageTest extends \WP_UnitTestCase /** - * @covers SettingsPage::sanitizeOptions() + * @covers wordpress\src\Shy\WordPress\SettingsPage::sanitizeOptions() */ public function testSanitize() {