From 571b865fcd4a0a8bb9ca48a862dd8f72116b30dc Mon Sep 17 00:00:00 2001 From: maximebf Date: Wed, 19 Jun 2013 11:34:47 +0900 Subject: [PATCH] moved web files from web/ to src/DebugBar/Resources --- demo/bootstrap.php | 2 +- demo/dump_assets.php | 15 ++++ src/DebugBar/JavascriptRenderer.php | 78 ++++++++++++++++-- {web => src/DebugBar/Resources}/debugbar.css | 0 {web => src/DebugBar/Resources}/debugbar.js | 0 {web => src/DebugBar/Resources}/php-icon.png | Bin .../font-awesome/css/font-awesome-ie7.css | 0 .../font-awesome/css/font-awesome-ie7.min.css | 0 .../vendor/font-awesome/css/font-awesome.css | 0 .../font-awesome/css/font-awesome.min.css | 0 .../vendor/font-awesome/font/FontAwesome.otf | Bin .../font-awesome/font/fontawesome-webfont.eot | Bin .../font-awesome/font/fontawesome-webfont.svg | 0 .../font-awesome/font/fontawesome-webfont.ttf | Bin .../font/fontawesome-webfont.woff | Bin .../vendor/font-awesome/less/bootstrap.less | 0 .../vendor/font-awesome/less/core.less | 0 .../vendor/font-awesome/less/extras.less | 0 .../font-awesome/less/font-awesome-ie7.less | 0 .../font-awesome/less/font-awesome.less | 0 .../vendor/font-awesome/less/icons.less | 0 .../vendor/font-awesome/less/mixins.less | 0 .../vendor/font-awesome/less/path.less | 0 .../vendor/font-awesome/less/variables.less | 0 .../vendor/font-awesome/scss/_bootstrap.scss | 0 .../vendor/font-awesome/scss/_core.scss | 0 .../vendor/font-awesome/scss/_extras.scss | 0 .../vendor/font-awesome/scss/_icons.scss | 0 .../vendor/font-awesome/scss/_mixins.scss | 0 .../vendor/font-awesome/scss/_path.scss | 0 .../vendor/font-awesome/scss/_variables.scss | 0 .../font-awesome/scss/font-awesome-ie7.scss | 0 .../font-awesome/scss/font-awesome.scss | 0 .../Resources}/vendor/jquery-1.8.3.min.js | 0 .../vendor/jquery.event.drag-2.2.js | 0 {web => src/DebugBar/Resources}/widgets.js | 0 36 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 demo/dump_assets.php rename {web => src/DebugBar/Resources}/debugbar.css (100%) rename {web => src/DebugBar/Resources}/debugbar.js (100%) rename {web => src/DebugBar/Resources}/php-icon.png (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/css/font-awesome-ie7.css (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/css/font-awesome-ie7.min.css (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/css/font-awesome.css (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/css/font-awesome.min.css (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/font/FontAwesome.otf (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/font/fontawesome-webfont.eot (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/font/fontawesome-webfont.svg (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/font/fontawesome-webfont.ttf (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/font/fontawesome-webfont.woff (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/bootstrap.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/core.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/extras.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/font-awesome-ie7.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/font-awesome.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/icons.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/mixins.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/path.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/less/variables.less (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_bootstrap.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_core.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_extras.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_icons.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_mixins.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_path.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/_variables.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/font-awesome-ie7.scss (100%) rename {web => src/DebugBar/Resources}/vendor/font-awesome/scss/font-awesome.scss (100%) rename {web => src/DebugBar/Resources}/vendor/jquery-1.8.3.min.js (100%) rename {web => src/DebugBar/Resources}/vendor/jquery.event.drag-2.2.js (100%) rename {web => src/DebugBar/Resources}/widgets.js (100%) diff --git a/demo/bootstrap.php b/demo/bootstrap.php index 771a0c8..ba915b9 100644 --- a/demo/bootstrap.php +++ b/demo/bootstrap.php @@ -5,4 +5,4 @@ include '../tests/bootstrap.php'; use DebugBar\StandardDebugBar; $debugbar = new StandardDebugBar(); -$debugbarRenderer = $debugbar->getJavascriptRenderer()->setBaseUrl('../web'); +$debugbarRenderer = $debugbar->getJavascriptRenderer()->setBaseUrl('../src/DebugBar/Resources'); diff --git a/demo/dump_assets.php b/demo/dump_assets.php new file mode 100644 index 0000000..cee79ad --- /dev/null +++ b/demo/dump_assets.php @@ -0,0 +1,15 @@ +dumpCssAssets(); +} else if ($_GET['type'] == 'js') { + header('content-type', 'text/javascript'); + $debugbarRenderer->dumpJsAssets(); +} diff --git a/src/DebugBar/JavascriptRenderer.php b/src/DebugBar/JavascriptRenderer.php index 52703db..b034383 100644 --- a/src/DebugBar/JavascriptRenderer.php +++ b/src/DebugBar/JavascriptRenderer.php @@ -52,13 +52,17 @@ class JavascriptRenderer * @param string $baseUrl * @param string $basePath */ - public function __construct(DebugBar $debugBar, $baseUrl = '/debugbar', $basePath = null) + public function __construct(DebugBar $debugBar, $baseUrl = null, $basePath = null) { $this->debugBar = $debugBar; + + if ($baseUrl === null) { + $baseUrl = '/vendor/maximebf/debugbar/src/DebugBar/Resources'; + } $this->baseUrl = $baseUrl; if ($basePath === null) { - $basePath = __DIR__ . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, array('..', '..', '..', 'web')); + $basePath = __DIR__ . DIRECTORY_SEPARATOR . 'Resources'; } $this->basePath = $basePath; @@ -224,9 +228,10 @@ class JavascriptRenderer /** * Returns the list of asset files * + * @param string $type Only return css or js files * @return array */ - protected function getAssetFiles() + protected function getAssetFiles($type = null) { $cssFiles = $this->cssFiles; $jsFiles = $this->jsFiles; @@ -236,22 +241,42 @@ class JavascriptRenderer $jsFiles = array_merge($this->jsVendors, $jsFiles); } - return array($cssFiles, $jsFiles); + return $this->filterAssetArray(array($cssFiles, $jsFiles), $type); + } + + /** + * Filters a tuple of (css, js) assets according to $type + * + * @param array $array + * @param string $type 'css', 'js' or null for both + * @return array + */ + protected function filterAssetArray($array, $type = null) + { + $type = strtolower($type); + if ($type === 'css') { + return $array[0]; + } + if ($type === 'js') { + return $array[1]; + } + return $array; } /** * Returns a tuple where the both items are Assetic AssetCollection, * the first one being css files and the second js files * + * @param string $type Only return css or js collection * @return array or \Assetic\Asset\AssetCollection */ - public function getAsseticCollection() + public function getAsseticCollection($type = null) { list($cssFiles, $jsFiles) = $this->getAssetFiles(); - return array( + return $this->filterAssetArray(array( $this->createAsseticCollection($cssFiles), $this->createAsseticCollection($jsFiles) - ); + ), $type); } /** @@ -271,6 +296,45 @@ class JavascriptRenderer return new \Assetic\Asset\AssetCollection($assets); } + /** + * Write all CSS assets to standard output or in a file + * + * @param string $targetFilename + */ + public function dumpCssAssets($targetFilename = null) + { + $this->dumpAssets($this->getAssetFiles('css'), $targetFilename); + } + + /** + * Write all JS assets to standard output or in a file + * + * @param string $targetFilename + */ + public function dumpJsAssets($targetFilename = null) + { + $this->dumpAssets($this->getAssetFiles('js'), $targetFilename); + } + + /** + * Write assets to standard output or in a file + * + * @param array $files + * @param string $targetFilename + */ + protected function dumpAssets($files, $targetFilename = null) + { + $content = ''; + foreach ($files as $file) { + $content .= file_get_contents($this->makeUriRelativeTo($file, $this->basePath)) . "\n"; + } + if ($targetFilename !== null) { + file_put_contents($targetFilename, $content); + } else { + echo $content; + } + } + /** * Renders the html to include needed assets * diff --git a/web/debugbar.css b/src/DebugBar/Resources/debugbar.css similarity index 100% rename from web/debugbar.css rename to src/DebugBar/Resources/debugbar.css diff --git a/web/debugbar.js b/src/DebugBar/Resources/debugbar.js similarity index 100% rename from web/debugbar.js rename to src/DebugBar/Resources/debugbar.js diff --git a/web/php-icon.png b/src/DebugBar/Resources/php-icon.png similarity index 100% rename from web/php-icon.png rename to src/DebugBar/Resources/php-icon.png diff --git a/web/vendor/font-awesome/css/font-awesome-ie7.css b/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome-ie7.css similarity index 100% rename from web/vendor/font-awesome/css/font-awesome-ie7.css rename to src/DebugBar/Resources/vendor/font-awesome/css/font-awesome-ie7.css diff --git a/web/vendor/font-awesome/css/font-awesome-ie7.min.css b/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome-ie7.min.css similarity index 100% rename from web/vendor/font-awesome/css/font-awesome-ie7.min.css rename to src/DebugBar/Resources/vendor/font-awesome/css/font-awesome-ie7.min.css diff --git a/web/vendor/font-awesome/css/font-awesome.css b/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.css similarity index 100% rename from web/vendor/font-awesome/css/font-awesome.css rename to src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.css diff --git a/web/vendor/font-awesome/css/font-awesome.min.css b/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css similarity index 100% rename from web/vendor/font-awesome/css/font-awesome.min.css rename to src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css diff --git a/web/vendor/font-awesome/font/FontAwesome.otf b/src/DebugBar/Resources/vendor/font-awesome/font/FontAwesome.otf similarity index 100% rename from web/vendor/font-awesome/font/FontAwesome.otf rename to src/DebugBar/Resources/vendor/font-awesome/font/FontAwesome.otf diff --git a/web/vendor/font-awesome/font/fontawesome-webfont.eot b/src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.eot similarity index 100% rename from web/vendor/font-awesome/font/fontawesome-webfont.eot rename to src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.eot diff --git a/web/vendor/font-awesome/font/fontawesome-webfont.svg b/src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.svg similarity index 100% rename from web/vendor/font-awesome/font/fontawesome-webfont.svg rename to src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.svg diff --git a/web/vendor/font-awesome/font/fontawesome-webfont.ttf b/src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.ttf similarity index 100% rename from web/vendor/font-awesome/font/fontawesome-webfont.ttf rename to src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.ttf diff --git a/web/vendor/font-awesome/font/fontawesome-webfont.woff b/src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.woff similarity index 100% rename from web/vendor/font-awesome/font/fontawesome-webfont.woff rename to src/DebugBar/Resources/vendor/font-awesome/font/fontawesome-webfont.woff diff --git a/web/vendor/font-awesome/less/bootstrap.less b/src/DebugBar/Resources/vendor/font-awesome/less/bootstrap.less similarity index 100% rename from web/vendor/font-awesome/less/bootstrap.less rename to src/DebugBar/Resources/vendor/font-awesome/less/bootstrap.less diff --git a/web/vendor/font-awesome/less/core.less b/src/DebugBar/Resources/vendor/font-awesome/less/core.less similarity index 100% rename from web/vendor/font-awesome/less/core.less rename to src/DebugBar/Resources/vendor/font-awesome/less/core.less diff --git a/web/vendor/font-awesome/less/extras.less b/src/DebugBar/Resources/vendor/font-awesome/less/extras.less similarity index 100% rename from web/vendor/font-awesome/less/extras.less rename to src/DebugBar/Resources/vendor/font-awesome/less/extras.less diff --git a/web/vendor/font-awesome/less/font-awesome-ie7.less b/src/DebugBar/Resources/vendor/font-awesome/less/font-awesome-ie7.less similarity index 100% rename from web/vendor/font-awesome/less/font-awesome-ie7.less rename to src/DebugBar/Resources/vendor/font-awesome/less/font-awesome-ie7.less diff --git a/web/vendor/font-awesome/less/font-awesome.less b/src/DebugBar/Resources/vendor/font-awesome/less/font-awesome.less similarity index 100% rename from web/vendor/font-awesome/less/font-awesome.less rename to src/DebugBar/Resources/vendor/font-awesome/less/font-awesome.less diff --git a/web/vendor/font-awesome/less/icons.less b/src/DebugBar/Resources/vendor/font-awesome/less/icons.less similarity index 100% rename from web/vendor/font-awesome/less/icons.less rename to src/DebugBar/Resources/vendor/font-awesome/less/icons.less diff --git a/web/vendor/font-awesome/less/mixins.less b/src/DebugBar/Resources/vendor/font-awesome/less/mixins.less similarity index 100% rename from web/vendor/font-awesome/less/mixins.less rename to src/DebugBar/Resources/vendor/font-awesome/less/mixins.less diff --git a/web/vendor/font-awesome/less/path.less b/src/DebugBar/Resources/vendor/font-awesome/less/path.less similarity index 100% rename from web/vendor/font-awesome/less/path.less rename to src/DebugBar/Resources/vendor/font-awesome/less/path.less diff --git a/web/vendor/font-awesome/less/variables.less b/src/DebugBar/Resources/vendor/font-awesome/less/variables.less similarity index 100% rename from web/vendor/font-awesome/less/variables.less rename to src/DebugBar/Resources/vendor/font-awesome/less/variables.less diff --git a/web/vendor/font-awesome/scss/_bootstrap.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_bootstrap.scss similarity index 100% rename from web/vendor/font-awesome/scss/_bootstrap.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_bootstrap.scss diff --git a/web/vendor/font-awesome/scss/_core.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_core.scss similarity index 100% rename from web/vendor/font-awesome/scss/_core.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_core.scss diff --git a/web/vendor/font-awesome/scss/_extras.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_extras.scss similarity index 100% rename from web/vendor/font-awesome/scss/_extras.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_extras.scss diff --git a/web/vendor/font-awesome/scss/_icons.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_icons.scss similarity index 100% rename from web/vendor/font-awesome/scss/_icons.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_icons.scss diff --git a/web/vendor/font-awesome/scss/_mixins.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_mixins.scss similarity index 100% rename from web/vendor/font-awesome/scss/_mixins.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_mixins.scss diff --git a/web/vendor/font-awesome/scss/_path.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_path.scss similarity index 100% rename from web/vendor/font-awesome/scss/_path.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_path.scss diff --git a/web/vendor/font-awesome/scss/_variables.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/_variables.scss similarity index 100% rename from web/vendor/font-awesome/scss/_variables.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/_variables.scss diff --git a/web/vendor/font-awesome/scss/font-awesome-ie7.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/font-awesome-ie7.scss similarity index 100% rename from web/vendor/font-awesome/scss/font-awesome-ie7.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/font-awesome-ie7.scss diff --git a/web/vendor/font-awesome/scss/font-awesome.scss b/src/DebugBar/Resources/vendor/font-awesome/scss/font-awesome.scss similarity index 100% rename from web/vendor/font-awesome/scss/font-awesome.scss rename to src/DebugBar/Resources/vendor/font-awesome/scss/font-awesome.scss diff --git a/web/vendor/jquery-1.8.3.min.js b/src/DebugBar/Resources/vendor/jquery-1.8.3.min.js similarity index 100% rename from web/vendor/jquery-1.8.3.min.js rename to src/DebugBar/Resources/vendor/jquery-1.8.3.min.js diff --git a/web/vendor/jquery.event.drag-2.2.js b/src/DebugBar/Resources/vendor/jquery.event.drag-2.2.js similarity index 100% rename from web/vendor/jquery.event.drag-2.2.js rename to src/DebugBar/Resources/vendor/jquery.event.drag-2.2.js diff --git a/web/widgets.js b/src/DebugBar/Resources/widgets.js similarity index 100% rename from web/widgets.js rename to src/DebugBar/Resources/widgets.js