* Fixed/enhanced migration script for tag registration statements.

* Added script tp update to expression tag place holder syntax.

migration/migrate-code.sh

@@ -25,6 +25,12 @@ $PHP_BINARY $SCRIPT_DIR/migrate_taglib_registration.php
 echo "* Consolidate tag usage ..."
 $PHP_BINARY $SCRIPT_DIR/migrate_consolidate_tag_usage.php
 
+echo "* Remove redundant tag lib registration ..."
+$PHP_BINARY $SCRIPT_DIR/migrate_extract_add_tag_statements.php
+
+echo "* Switch to new place holder logic ..."
+$PHP_BINARY $SCRIPT_DIR/migrate_update_place_holders_to_expression_notation.php
+
 echo
 echo "#############################################"
 echo

migration/migrate_extract_add_tag_statements.php

@@ -0,0 +1,52 @@
+<?php
+// Collect all <*:addtaglib /> tags, remove them from the templates, and suggest index.php
+// statements to add for custom tags.
+
+use APF\core\pagecontroller\TagLib;
+use APF\core\pagecontroller\XmlParser;
+
+include(dirname(__FILE__) . '/migrate_base.php');
+include(dirname(dirname(__FILE__)) . '/core/pagecontroller/XmlParser.php');
+include(dirname(dirname(__FILE__)) . '/core/pagecontroller/TagLib.php');
+include(dirname(dirname(__FILE__)) . '/core/bootstrap.php');
+
+\APF\core\exceptionhandler\GlobalExceptionHandler::disable();
+\APF\core\errorhandler\GlobalErrorHandler::disable();
+
+$files = find('.', '*.html');
+
+$search = '#<([A-Za-z\-_]+):addtaglib([ |\n|\r\n|\r]+)(.*)/>#smU';
+
+$class = new ReflectionClass('APF\core\pagecontroller\Document');
+$property = $class->getProperty('knownTags');
+$property->setAccessible(true);
+
+$registeredTags = $property->getValue();
+
+function isRegistered(array $registeredTags, $class, $prefix, $name) {
+   /* @var $tag TagLib */
+   foreach ($registeredTags as $tag) {
+      if ($tag->getClass() === $class && $tag->getPrefix() === $prefix && $tag->getName() === $name) {
+         return true;
+      }
+   }
+
+   return false;
+}
+
+foreach ($files as $file) {
+   $content = file_get_contents($file);
+
+   preg_match_all($search, $content, $matches, PREG_SET_ORDER);
+
+   foreach ($matches as $match) {
+      $attributes = XmlParser::getAttributesFromString(trim($match[3]));
+
+      if (isRegistered($registeredTags, $attributes['class'], $attributes['prefix'], $attributes['name'])) {
+         $content = str_replace($match[0], '', $content);
+      }
+
+   }
+
+   file_put_contents($file, $content);
+}

migration/migrate_update_place_holders_to_expression_notation.php

@@ -0,0 +1,15 @@
+<?php
+include(dirname(__FILE__) . '/migrate_base.php');
+
+$files = find('.', '*.html');
+
+// <html:placeholder name="..."/>
+$search = '#<html:placeholder([ |\n|\r\n|\r]+)name ?= ?"(.+)"([ |\n|\r\n|\r]*)/>#mU';
+
+foreach ($files as $file) {
+   $content = file_get_contents($file);
+
+   $content = preg_replace($search, '${\\2}', $content);
+
+   file_put_contents($file, $content);
+}