From 790954df7b3959af479a71bae0905c1c11a56fb7 Mon Sep 17 00:00:00 2001
From: knut <>
Date: Thu, 23 Feb 2006 18:49:14 +0000
Subject: Created an XmlLintTask to validate configuration against XML Schema
Definitions and a new target lint-demos to check both syntax of demo
configuration and PHP source files
---
.gitattributes | 1 +
build.xml | 28 +++++++-
buildscripts/phing/tasks/PhpLintTask.php | 9 ++-
buildscripts/phing/tasks/XmlLintTask.php | 102 +++++++++++++++++++++++++++++
demos/quickstart/protected/application.xml | 6 +-
5 files changed, 140 insertions(+), 6 deletions(-)
create mode 100644 buildscripts/phing/tasks/XmlLintTask.php
diff --git a/.gitattributes b/.gitattributes
index 58690b9d..4f511c4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,6 +14,7 @@ buildscripts/phing/style/phpunit2-frames.xsl -text
buildscripts/phing/style/phpunit2-noframes.xsl -text
buildscripts/phing/style/str.replace.function.xsl -text
buildscripts/phing/tasks/PhpLintTask.php -text
+buildscripts/phing/tasks/XmlLintTask.php -text
buildscripts/phpbuilder/build.php -text
buildscripts/phpbuilder/files.txt -text
buildscripts/texbuilder/build.php -text
diff --git a/build.xml b/build.xml
index 3fac96b5..e0ea5fd6 100644
--- a/build.xml
+++ b/build.xml
@@ -32,8 +32,11 @@
+
+
+
@@ -82,6 +85,29 @@
+
+ Validate application configuration
+
+
+
+
+
+
+ Validate page configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -157,7 +183,7 @@
-
+
diff --git a/buildscripts/phing/tasks/PhpLintTask.php b/buildscripts/phing/tasks/PhpLintTask.php
index 63ae6dde..2fd89fc3 100644
--- a/buildscripts/phing/tasks/PhpLintTask.php
+++ b/buildscripts/phing/tasks/PhpLintTask.php
@@ -34,6 +34,10 @@ class PhpLintTask extends Task {
* Execute lint check against PhingFile or a FileSet
*/
public function main() {
+ if(!isset($this->file) and count($this->filesets) == 0) {
+ throw new BuildException("Missing either a nested fileset or attribute 'file' set");
+ }
+
if($this->file instanceof PhingFile) {
$this->lint($this->file->getPath());
} else { // process filesets
@@ -47,7 +51,6 @@ class PhpLintTask extends Task {
}
}
}
- $this->log('No syntax errors detected');
}
/**
@@ -63,7 +66,9 @@ class PhpLintTask extends Task {
$message = array();
exec($command.$file, $message);
if(!preg_match('/^No syntax errors detected/', $message[0])) {
- throw new BuildException($message[1]);
+ $this->log($message[1], PROJECT_MSG_ERR);
+ } else {
+ $this->log($file.': No syntax errors detected', PROJECT_MSG_INFO);
}
} else {
throw new BuildException('Permission denied: '.$file);
diff --git a/buildscripts/phing/tasks/XmlLintTask.php b/buildscripts/phing/tasks/XmlLintTask.php
new file mode 100644
index 00000000..96f58234
--- /dev/null
+++ b/buildscripts/phing/tasks/XmlLintTask.php
@@ -0,0 +1,102 @@
+
+ * @package phing.tasks.ext
+ */
+class XmlLintTask extends Task {
+
+ protected $file; // the source file (from xml attribute)
+ protected $schema; // the schema file (from xml attribute)
+ protected $filesets = array(); // all fileset objects assigned to this task
+
+ /**
+ * File to be performed syntax check on
+ * @param PhingFile $file
+ */
+ public function setFile(PhingFile $file) {
+ $this->file = $file;
+ }
+
+ public function setSchema(PhingFile $schema) {
+ $this->schema = $schema;
+ }
+
+ /**
+ * Nested creator, creates a FileSet for this task
+ *
+ * @return FileSet The created fileset object
+ */
+ function createFileSet() {
+ $num = array_push($this->filesets, new FileSet());
+ return $this->filesets[$num-1];
+ }
+
+ /**
+ * Execute lint check against PhingFile or a FileSet
+ */
+ public function main() {
+ if(!isset($this->schema)) {
+ throw new BuildException("Missing attribute 'schema'");
+ }
+ $schema = $this->schema->getPath();
+ if(!file_exists($schema)) {
+ throw new BuildException("File not found: ".$schema);
+ }
+ if(!isset($this->file) and count($this->filesets) == 0) {
+ throw new BuildException("Missing either a nested fileset or attribute 'file' set");
+ }
+
+ set_error_handler(array($this, 'errorHandler'));
+ if($this->file instanceof PhingFile) {
+ $this->lint($this->file->getPath());
+ } else { // process filesets
+ $project = $this->getProject();
+ foreach($this->filesets as $fs) {
+ $ds = $fs->getDirectoryScanner($project);
+ $files = $ds->getIncludedFiles();
+ $dir = $fs->getDir($this->project)->getPath();
+ foreach($files as $file) {
+ $this->lint($dir.DIRECTORY_SEPARATOR.$file);
+ }
+ }
+ }
+ restore_error_handler();
+ }
+
+ /**
+ * Performs validation
+ *
+ * @param string $file
+ * @return void
+ */
+ protected function lint($file) {
+ if(file_exists($file)) {
+ if(is_readable($file)) {
+ $dom = new DOMDocument();
+ $dom->load($file);
+ if($dom->schemaValidate($this->schema->getPath())) {
+ $this->log($file.' validated', PROJECT_MSG_INFO);
+ } else {
+ $this->log($file.' fails to validate (See messages above)', PROJECT_MSG_ERR);
+ }
+ } else {
+ throw new BuildException('Permission denied: '.$file);
+ }
+ } else {
+ throw new BuildException('File not found: '.$file);
+ }
+ }
+
+ public function errorHandler($level, $message, $file, $line, $context) {
+ $matches = array();
+ preg_match('/^.*\(\): (.*)$/', $message, $matches);
+ $this->log($matches[1], PROJECT_MSG_ERR);
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/application.xml b/demos/quickstart/protected/application.xml
index 88cab8d1..743c8ddd 100644
--- a/demos/quickstart/protected/application.xml
+++ b/demos/quickstart/protected/application.xml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -10,7 +10,7 @@
-->
-
+
--
cgit v1.2.3