Browse Source

Remove cruft from CacheHelper.

Remove dead views and remaining nocache tags.

Refs #5811
Mark Story 11 years ago
parent
commit
49ea7dd1ad

+ 0 - 2
tests/test_app/Plugin/TestTheme/src/Template/Posts/themed.ctp

@@ -1,4 +1,2 @@
 posts themed themed file.
-<!--nocache-->
 <?= $this->element('test_element'); ?>
-<!--/nocache-->

+ 0 - 5
tests/test_app/TestApp/Template/Element/nocache/contains_nocache.ctp

@@ -1,5 +0,0 @@
-<h2>Cache Me</h2>
-<!--nocache-->
-	<p>F. In Element With No Cache Tags</p>
-	<?php $this->log('6. in element with no cache tags') ?>
-<!--/nocache-->

+ 0 - 4
tests/test_app/TestApp/Template/Element/nocache/plain.ctp

@@ -1,4 +0,0 @@
-<h2>Cache Me</h2>
-	<p>B. In Plain Element</p>
-	<?php $this->log('2. in plain element') ?>
-

+ 0 - 8
tests/test_app/TestApp/Template/Element/nocache/sub1.ctp

@@ -1,8 +0,0 @@
-<?= $this->element('nocache/sub2'); ?>
-
-<!--nocache-->
-	<?php $foobar = 'in sub1'; ?>
-	<?= $foobar; ?>
-<!--/nocache-->
-
-<?= 'printing: "' . $foobar . '"'; ?>

+ 0 - 6
tests/test_app/TestApp/Template/Element/nocache/sub2.ctp

@@ -1,6 +0,0 @@
-<!--nocache-->
-	<?php $barfoo = 'in sub2'; ?>
-	<?= $barfoo; ?>
-<!--/nocache-->
-
-<?= 'printing: "' . $barfoo . '"'; ?>

+ 0 - 13
tests/test_app/TestApp/Template/Layout/cache_empty_sections.ctp

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><?= $this->fetch('title'); ?></title>
-    <!--nocache--><?php $x = 1; ?><!--/nocache-->
-</head>
-<body>
-    <!--nocache--><?php $x++; ?><!--/nocache-->
-    <!--nocache--><?php $x++; ?><!--/nocache-->
-    <?= $this->fetch('content'); ?>
-    <!--nocache--><?= 'cached count is: ' . $x; ?><!--/nocache-->
-</body>
-</html>

+ 0 - 13
tests/test_app/TestApp/Template/Layout/cache_layout.ctp

@@ -1,13 +0,0 @@
-<p>This is regular text</p>
-<!--nocache-->
-    <?= microtime(); ?>
-<!--/nocache-->
-
-<?= $this->fetch('content'); ?>
-
-<?= $superman; ?>
-
-<!--nocache-->
-    <?= $variable; ?>
-<!--/nocache-->
-<p>Additional regular text.</p>

+ 0 - 21
tests/test_app/TestApp/Template/Layout/multi_cache.ctp

@@ -1,21 +0,0 @@
-<p>This is regular text</p>
-<!--nocache-->
-    <p>A. Layout Before Content</p>
-    <?php $this->log('1. layout before content') ?>
-<!--/nocache-->
-<!--nocache--><?= $this->element('nocache/plain'); ?><!--/nocache-->
-<!--nocache-->
-    <p>C. Layout After Test Element But Before Content</p>
-    <?php $this->log('3. layout after test element but before content') ?>
-<!--/nocache-->
-<?= $this->fetch('content'); ?>
-<!--nocache-->
-    <p>E. Layout After Content</p>
-    <?php $this->log('5. layout after content') ?>
-<!--/nocache-->
-<p>Additional regular text.</p>
-<?= $this->element('nocache/contains_nocache'); ?>
-<!--nocache-->
-    <p>G. Layout After Content And After Element With No Cache Tags</p>
-    <?php $this->log('7. layout after content and after element with no cache tags') ?>
-<!--/nocache-->

+ 0 - 2
tests/test_app/TestApp/Template/Posts/cache_empty_sections.ctp

@@ -1,2 +0,0 @@
-View Content
-    <!--nocache--><?php $y = 1; ?><!--/nocache-->

+ 0 - 2
tests/test_app/TestApp/Template/Posts/cache_form.ctp

@@ -1,10 +1,8 @@
 <div class="users form">
-<!--nocache-->
     <?= $this->Form->create(false); ?>
         <fieldset>
             <legend><?= __('Add User'); ?></legend>
         </fieldset>
     <?= $this->Form->submit('Submit'); ?>
     <?= $this->Form->end(); ?>
-<!--/nocache-->
 </div>

+ 0 - 15
tests/test_app/TestApp/Template/Posts/multiple_nocache.ctp

@@ -1,15 +0,0 @@
---view start--
-<!--nocache-->
-    <?= $batman ?>
-<!--/nocache-->
-
-this view has 3 nocache blocks
-
-<!--nocache-->
-    <?= $spiderman; ?>
-<!--/nocache-->
-
-<!--nocache-->
-    <?= 'some string'; ?>
-<!--/nocache-->
---view end--

+ 0 - 9
tests/test_app/TestApp/Template/Posts/nocache_multiple_element.ctp

@@ -1,9 +0,0 @@
-<!--nocache-->
-    <?= $foo; ?>
-<!--/nocache-->
-
-<!--nocache-->
-    <?= $bar; ?>
-<!--/nocache-->
-
-<?= $this->element('nocache/sub1'); ?>

+ 0 - 5
tests/test_app/TestApp/Template/Posts/sequencial_nocache.ctp

@@ -1,5 +0,0 @@
-<h1>Content</h1>
-<!--nocache-->
-    <p>D. In View File</p>
-    <?php $this->log('4. in view file') ?>
-<!--/nocache-->

+ 0 - 97
tests/test_app/TestApp/Template/Posts/test_nocache_tags.ctp

@@ -1,97 +0,0 @@
-<?php
-use Cake\Datasource\ConnectionManager;
-use Cake\Core\Configure;
-?>
-<p>
-    <!--nocache-->
-    <span class="notice">
-        <?php
-            echo __d('cake', 'Your tmp directory is ');
-            if (is_writable(TMP)):
-                echo __d('cake', 'writable.');
-            else:
-                echo __d('cake', 'NOT writable.');
-            endif;
-        ?>
-    </span>
-    <!--/nocache-->
-</p>
-<p>
-    <span class="notice">
-        <?php
-            echo __d('cake', 'Your datasources configuration file is ');
-            $filePresent = null;
-            if (file_exists(APP . 'Config'.'datasources.php')):
-                echo __d('cake', 'present.');
-                $filePresent = true;
-            else:
-                echo __d('cake', 'NOT present.');
-                echo '<br/>';
-                echo __d('cake', 'Rename App/Config/datasources.default.php to App/Config/datasources.php');
-            endif;
-        ?>
-    </span>
-</p>
-<?php
-if (!empty($filePresent)):
-    $connected = ConnectionManager::get('default');
-?>
-<p>
-    <span class="notice">
-        <?= __d('cake', 'Cake');
-            if ($connected->isConnected()):
-                __d('cake', ' is able to ');
-            else:
-                __d('cake', ' is NOT able to ');
-            endif;
-            __d('cake', 'connect to the database.');
-        ?>
-    </span>
-</p>
-<?php endif; ?>
-<h2><?= __d('cake', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?= __d('cake', 'Read the release notes and get the latest version'); ?> </a>
-<h2><?= __d('cake', 'Editing this Page'); ?></h2>
-<p>
-<?= __d('cake', 'To change the content of this page, create: /app/View/Pages/home.ctp.'); ?><br/>
-<?= __d('cake', 'To change its layout, create: /app/View/Layout/default.ctp.'); ?><br/>
-<a href="http://manual.cakephp.org/"><?= __d('cake', 'See the views section of the manual for more info.'); ?> </a><br/>
-<?= __d('cake', 'You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
-</p>
-<h2><?= __d('cake', 'Getting Started'); ?></h2>
-<p>
-<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?= __d('cake', 'The 15 min Blog Tutorial'); ?></a><br/>
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?= __d('cake', 'Cook up Web sites fast with CakePHP'); ?></a><br/>
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?= __d('cake', 'Create an interactive production wiki using PHP'); ?></a>
-</p>
-<h2><?= __d('cake', 'More about CakePHP'); ?></h2>
-<p>
-<?= __d('cake', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
-</p>
-<p>
-<?= __d('cake', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
-</p>
-<ul>
-    <li><a href="http://cakefoundation.org/"><?= __d('cake', 'Cake Software Foundation'); ?> </a>
-    <ul><li><?= __d('cake', 'Promoting development related to CakePHP'); ?></li></ul></li>
-    <li><a href="http://bakery.cakephp.org"><?= __d('cake', 'The Bakery'); ?> </a>
-    <ul><li><?= __d('cake', 'Everything CakePHP'); ?></li></ul></li>
-    <li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?= __d('cake', 'Book Store'); ?> </a>
-    <ul><li><?= __d('cake', 'Recommended Software Books'); ?></li></ul></li>
-    <li><a href="http://www.cafepress.com/cakefoundation"><?= __d('cake', 'CakeSchwag'); ?> </a>
-    <ul><li><?= __d('cake', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
-    <li><a href="http://www.cakephp.org"><?= __d('cake', 'CakePHP'); ?> </a>
-    <ul><li><?= __d('cake', 'The Rapid Development Framework'); ?></li></ul></li>
-    <li><a href="http://manual.cakephp.org"><?= __d('cake', 'CakePHP Manual'); ?> </a>
-    <ul><li><?= __d('cake', 'Your Rapid Development Cookbook'); ?></li></ul></li>
-    <li><a href="http://api.cakephp.org"><?= __d('cake', 'CakePHP API'); ?> </a>
-    <ul><li><?= __d('cake', 'Docblock Your Best Friend'); ?></li></ul></li>
-    <li><a href="http://www.cakeforge.org"><?= __d('cake', 'CakeForge'); ?> </a>
-    <ul><li><?= __d('cake', 'Open Development for CakePHP'); ?></li></ul></li>
-    <li><a href="https://trac.cakephp.org/"><?= __d('cake', 'CakePHP Trac'); ?> </a>
-    <ul><li><?= __d('cake', 'For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
-    <li><a href="http://groups-beta.google.com/group/cake-php"><?= __d('cake', 'CakePHP Google Group'); ?> </a>
-    <ul><li><?= __d('cake', 'Community mailing list'); ?></li></ul></li>
-    <li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
-    <ul><li><?= __d('cake', 'Live chat about CakePHP'); ?></li></ul></li>
-</ul>