From 6dae236ec5528522de472637f9d70a98158b9a5d Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Thu, 5 Feb 2015 11:45:26 +0100 Subject: Renamed 3rdparty directory to vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Php namespaces can’t begin with a number --- framework/Web/Services/TSoapServer.php | 4 ++-- framework/Web/UI/WebControls/TAccordion.php | 1 + framework/Web/UI/WebControls/TBaseValidator.php | 1 + framework/Web/UI/WebControls/TColorPicker.php | 1 + framework/Web/UI/WebControls/TColorPickerClientSide.php | 1 + framework/Web/UI/WebControls/TDatePicker.php | 1 + framework/Web/UI/WebControls/THtmlArea.php | 5 +++-- framework/Web/UI/WebControls/THtmlArea4.php | 1 + framework/Web/UI/WebControls/TKeyboard.php | 1 + framework/Web/UI/WebControls/TReCaptcha.php | 1 + framework/Web/UI/WebControls/TReCaptchaValidator.php | 1 + framework/Web/UI/WebControls/TSafeHtml.php | 2 +- framework/Web/UI/WebControls/TTabPanel.php | 1 + framework/Web/UI/WebControls/TTextBox.php | 2 +- framework/Web/UI/WebControls/TTextHighlighter.php | 6 +++--- framework/Web/UI/WebControls/TValidationSummary.php | 1 + 16 files changed, 21 insertions(+), 9 deletions(-) (limited to 'framework/Web') diff --git a/framework/Web/Services/TSoapServer.php b/framework/Web/Services/TSoapServer.php index 7bfa7d86..f737ae20 100644 --- a/framework/Web/Services/TSoapServer.php +++ b/framework/Web/Services/TSoapServer.php @@ -195,14 +195,14 @@ class TSoapServer extends \Prado\TApplicationComponent $wsdl=$cache->get(self::WSDL_CACHE_PREFIX.$providerClass); if(is_string($wsdl)) return $wsdl; - Prado::using('System.3rdParty.WsdlGen.WsdlGenerator'); + Prado::using('System.Vendor.WsdlGen.WsdlGenerator'); $wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding()); $cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl); return $wsdl; } else { - Prado::using('System.3rdParty.WsdlGen.WsdlGenerator'); + Prado::using('System.Vendor.WsdlGen.WsdlGenerator'); return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding()); } } diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php index 22e0bffd..e615324a 100644 --- a/framework/Web/UI/WebControls/TAccordion.php +++ b/framework/Web/UI/WebControls/TAccordion.php @@ -13,6 +13,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; use Prado\Exceptions\TInvalidDataValueException; +use Prado\Web\Javascripts\TJavaScript; /** * Class TAccordion. diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php index 291a29e6..43834246 100644 --- a/framework/Web/UI/WebControls/TBaseValidator.php +++ b/framework/Web/UI/WebControls/TBaseValidator.php @@ -12,6 +12,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; use Prado\Exceptions\TInvalidDataTypeException; +use Prado\Web\Javascripts\TJavaScript; /** * TBaseValidator class diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php index e114630f..876c464e 100644 --- a/framework/Web/UI/WebControls/TColorPicker.php +++ b/framework/Web/UI/WebControls/TColorPicker.php @@ -11,6 +11,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * TColorPicker class. diff --git a/framework/Web/UI/WebControls/TColorPickerClientSide.php b/framework/Web/UI/WebControls/TColorPickerClientSide.php index ba0a64a8..e335fb37 100644 --- a/framework/Web/UI/WebControls/TColorPickerClientSide.php +++ b/framework/Web/UI/WebControls/TColorPickerClientSide.php @@ -10,6 +10,7 @@ */ namespace Prado\Web\UI\WebControls; +use Prado\Web\UI\TClientSideOptions; /** * TColorPickerClientSide class. diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php index a1a2b19d..d88eb38a 100644 --- a/framework/Web/UI/WebControls/TDatePicker.php +++ b/framework/Web/UI/WebControls/TDatePicker.php @@ -11,6 +11,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index 8535c3cf..3856cdb1 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -11,6 +11,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * THtmlArea class @@ -424,8 +425,8 @@ class THtmlArea extends TTextBox */ protected function getScriptDeploymentPath() { - $tarfile = Prado::getPathOfNamespace('System.3rdParty.TinyMCE.tiny_mce', '.tar'); - $md5sum = Prado::getPathOfNamespace('System.3rdParty.TinyMCE.tiny_mce', '.md5'); + $tarfile = Prado::getPathOfNamespace('System.Vendor.TinyMCE.tiny_mce', '.tar'); + $md5sum = Prado::getPathOfNamespace('System.Vendor.TinyMCE.tiny_mce', '.md5'); if($tarfile===null || $md5sum===null) throw new TConfigurationException('htmlarea_tarfile_invalid'); $url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum); diff --git a/framework/Web/UI/WebControls/THtmlArea4.php b/framework/Web/UI/WebControls/THtmlArea4.php index ae11ab8c..c5410ffd 100644 --- a/framework/Web/UI/WebControls/THtmlArea4.php +++ b/framework/Web/UI/WebControls/THtmlArea4.php @@ -11,6 +11,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * THtmlArea4 class diff --git a/framework/Web/UI/WebControls/TKeyboard.php b/framework/Web/UI/WebControls/TKeyboard.php index e075a624..2aeb9d9e 100644 --- a/framework/Web/UI/WebControls/TKeyboard.php +++ b/framework/Web/UI/WebControls/TKeyboard.php @@ -12,6 +12,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * Class TKeyboard. diff --git a/framework/Web/UI/WebControls/TReCaptcha.php b/framework/Web/UI/WebControls/TReCaptcha.php index 5af6b0c5..c45c20da 100644 --- a/framework/Web/UI/WebControls/TReCaptcha.php +++ b/framework/Web/UI/WebControls/TReCaptcha.php @@ -12,6 +12,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * TReCaptcha class. diff --git a/framework/Web/UI/WebControls/TReCaptchaValidator.php b/framework/Web/UI/WebControls/TReCaptchaValidator.php index 84856c5c..80e195e0 100644 --- a/framework/Web/UI/WebControls/TReCaptchaValidator.php +++ b/framework/Web/UI/WebControls/TReCaptchaValidator.php @@ -11,6 +11,7 @@ */ namespace Prado\Web\UI\WebControls; +use Prado\Web\Javascripts\TJavaScript; /** * TReCaptchaValidator class diff --git a/framework/Web/UI/WebControls/TSafeHtml.php b/framework/Web/UI/WebControls/TSafeHtml.php index 1edce6de..aa5316e0 100644 --- a/framework/Web/UI/WebControls/TSafeHtml.php +++ b/framework/Web/UI/WebControls/TSafeHtml.php @@ -79,7 +79,7 @@ class TSafeHtml extends \Prado\Web\UI\TControl */ protected function parseSafeHtml($text) { - $renderer = Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser'); + $renderer = Prado::createComponent('System.Vendor.SafeHtml.TSafeHtmlParser'); return $renderer->parse($text, $this->getRepackUTF7()); } } diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php index 97337fee..4186ce3d 100644 --- a/framework/Web/UI/WebControls/TTabPanel.php +++ b/framework/Web/UI/WebControls/TTabPanel.php @@ -13,6 +13,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; use Prado\Exceptions\TInvalidDataValueException; +use Prado\Web\Javascripts\TJavaScript; /** * Class TTabPanel. diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php index 14a333e8..4e8252ca 100644 --- a/framework/Web/UI/WebControls/TTextBox.php +++ b/framework/Web/UI/WebControls/TTextBox.php @@ -529,7 +529,7 @@ class TTextBox extends \Prado\Web\UI\WebControls\TWebControl implements \Prado\W protected function getSafeTextParser() { if(!self::$_safeTextParser) - self::$_safeTextParser=Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser'); + self::$_safeTextParser=Prado::createComponent('System.Vendor.SafeHtml.TSafeHtmlParser'); return self::$_safeTextParser; } diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php index ea4e92ec..b6a0b46e 100644 --- a/framework/Web/UI/WebControls/TTextHighlighter.php +++ b/framework/Web/UI/WebControls/TTextHighlighter.php @@ -74,7 +74,7 @@ class TTextHighlighter extends TTextProcessor /** * @param string language (case-insensitive) whose syntax is to be used for highlighting. * Valid values are those file names (without suffix) that are contained - * in '3rdParty/TextHighlighter/Text/Highlighter'. Currently, the following languages are supported: + * in 'Vendor/TextHighlighter/Text/Highlighter'. Currently, the following languages are supported: * ABAP, CPP, CSS, DIFF, DTD, HTML, JAVA, JAVASCRIPT, * MYSQL, PERL, PHP, PRADO, PYTHON, RUBY, SQL, XML * If a language is not supported, it will be displayed as plain text. @@ -165,7 +165,7 @@ class TTextHighlighter extends TTextProcessor protected function registerStyleSheet() { $cs=$this->getPage()->getClientScript(); - $cssFile=Prado::getPathOfNamespace('Prado\\3rdParty\\TextHighlighter\\highlight','.css'); + $cssFile=Prado::getPathOfNamespace('Prado\\Vendor\\TextHighlighter\\highlight','.css'); $cssKey='prado:TTextHighlighter:'.$cssFile; if(!$cs->isStyleSheetFileRegistered($cssKey)) $cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile)); @@ -181,7 +181,7 @@ class TTextHighlighter extends TTextProcessor { try { - $highlighter=\Prado\3rdParty\TextHighlighter\Text\Highlighter::factory($this->getLanguage()); + $highlighter=\Prado\Vendor\TextHighlighter\Text\Highlighter::factory($this->getLanguage()); } catch(\Exception $e) { diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php index 64570356..765d92ff 100644 --- a/framework/Web/UI/WebControls/TValidationSummary.php +++ b/framework/Web/UI/WebControls/TValidationSummary.php @@ -11,6 +11,7 @@ namespace Prado\Web\UI\WebControls; use Prado\TPropertyValue; +use Prado\Web\Javascripts\TJavaScript; /** * TValidationSummary class -- cgit v1.2.3