Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into jmodelfix

  • Loading branch information...
2 parents 0a7653a + 8a32fb0 commit 10e681864526cb535e40c8a35a26bf444e9ab9f1 Donald Gilbert committed Oct 9, 2012
Showing 454 changed files with 20,861 additions and 16,576 deletions.
View
@@ -2,7 +2,15 @@
<project name="joomla-platform" default="build" basedir=".">
<property name="source" value="libraries" />
- <property name="joomlasource" value="libraries/joomla,libraries/platform.php,libraries/loader.php,libraries/import.php" />
+ <property name="joomlasource" value="libraries/joomla,libraries/legacy,libraries/compat,libraries/platform.php,libraries/loader.php,libraries/import.php" />
+
+ <condition property="script-suffix" value=".bat" else="">
+ <os family="windows" />
+ </condition>
+
+ <condition property="script-null" value="NUL" else="/dev/null">
+ <os family="windows" />
+ </condition>
<target name="clean" description="Clean up and create artifact directories">
<delete dir="${basedir}/build/api" />
@@ -19,11 +27,11 @@
</target>
<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
- <exec executable="phpunit" />
+ <exec executable="phpunit${script-suffix}" />
</target>
<target name="phpunit-legacy" description="Run legacy tests using PHPUnit and generates junit.legacy.xml and clover.legacy.xml">
- <exec executable="phpunit">
+ <exec executable="phpunit${script-suffix}">
<arg value="-c" />
<arg value="legacy.xml.dist" />
</exec>
@@ -43,7 +51,7 @@
</target>
<target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
- <exec executable="pdepend">
+ <exec executable="pdepend${script-suffix}">
<arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
<arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
<arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
@@ -52,7 +60,7 @@
</target>
<target name="phpmd" description="Generate pmd.xml using PHPMD">
- <exec executable="phpmd">
+ <exec executable="phpmd${script-suffix}">
<arg path="${joomlasource}" />
<arg value="xml" />
<arg value="${basedir}/build/phpmd.xml" />
@@ -62,33 +70,33 @@
</target>
<target name="phpcpd" description="Generate pmd-cpd.xml using PHPCPD">
- <exec executable="phpcpd">
+ <exec executable="phpcpd${script-suffix}">
<arg value="--log-pmd" />
<arg value="${basedir}/build/logs/pmd-cpd.xml" />
<arg path="${source}/joomla" />
</exec>
</target>
<target name="phploc" description="Generate phploc.csv">
- <exec executable="phploc">
+ <exec executable="phploc${script-suffix}">
<arg value="--log-csv" />
<arg value="${basedir}/build/logs/phploc.csv" />
<arg path="${source}/joomla" />
</exec>
</target>
<target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer">
- <exec executable="phpcs">
+ <exec executable="phpcs${script-suffix}">
<arg value="--report=checkstyle" />
+ <arg value="--extensions=php,css" />
<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
<arg value="--standard=${basedir}/build/phpcs/Joomla" />
- <arg value="--ignore=${source}/phpmailer,${source}/phputf8,${source}/simplepie/,${source}/config.example.php" />
<arg path="${source}" />
</exec>
</target>
<target name="phpdoc" description="Generate API documentation using PHPDocumentor">
- <exec executable="phpdox">
+ <exec executable="phpdox${script-suffix}">
<arg value="-c" />
<arg path="${source}" />
<arg value="-d" />
@@ -101,7 +109,7 @@
</target>
<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
- <exec executable="phpcb">
+ <exec executable="phpcb${script-suffix}">
<arg value="--log" />
<arg path="${basedir}/build/logs" />
<arg value="--source" />
@@ -111,5 +119,16 @@
</exec>
</target>
+ <target name="lint" description="Perform syntax check of sourcecode files">
+ <apply executable="php" failonerror="true">
+ <arg value="-l" />
+
+ <fileset dir="${source}">
+ <include name="**/*.php" />
+ <modified />
+ </fileset>
+ </apply>
+ </target>
+
<target name="build" depends="clean,phpunit,phpunit-legacy,parallelTasks,phpcb" />
</project>
@@ -1,145 +0,0 @@
-<?php
-/**
- * Joomla_Sniffs_Whitespace_ScopeClosingBraceSniff.
- *
- * PHP version 5
- *
- * @category PHP
- * @package PHP_CodeSniffer
- * @author Greg Sherwood <gsherwood@squiz.net>
- * @author Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version CVS: $Id: ScopeClosingBraceSniff.php 287526 2009-08-21 05:42:05Z squiz $
- * @link http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Joomla_Sniffs_Whitespace_ScopeClosingBraceSniff.
- *
- * Checks that the closing braces of scopes are aligned correctly.
- *
- * @category PHP
- * @package PHP_CodeSniffer
- * @author Greg Sherwood <gsherwood@squiz.net>
- * @author Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version Release: 1.3.0RC2
- * @link http://pear.php.net/package/PHP_CodeSniffer
- */
-class Joomla_Sniffs_WhiteSpace_ScopeClosingBraceSniff implements PHP_CodeSniffer_Sniff
-{
-
-
- /**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
- public function register()
- {
- return PHP_CodeSniffer_Tokens::$scopeOpeners;
-
- }//end register()
-
-
- /**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
- * @param int $stackPtr The position of the current token
- * in the stack passed in $tokens.
- *
- * @return void
- */
- public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
- {
- $tokens = $phpcsFile->getTokens();
-
- // If this is an inline condition (ie. there is no scope opener), then
- // return, as this is not a new scope.
- if (isset($tokens[$stackPtr]['scope_closer']) === false) {
- return;
- }
-
- $scopeStart = $tokens[$stackPtr]['scope_opener'];
- $scopeEnd = $tokens[$stackPtr]['scope_closer'];
-
- // If the scope closer doesn't think it belongs to this scope opener
- // then the opener is sharing its closer ith other tokens. We only
- // want to process the closer once, so skip this one.
- if ($tokens[$scopeEnd]['scope_condition'] !== $stackPtr) {
- return;
- }
-
- // We need to actually find the first piece of content on this line,
- // because if this is a method with tokens before it (public, static etc)
- // or an if with an else before it, then we need to start the scope
- // checking from there, rather than the current token.
- $lineStart = ($stackPtr - 1);
- for ($lineStart; $lineStart > 0; $lineStart--) {
- if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
- break;
- }
- }
-
- // We found a new line, now go forward and find the first non-whitespace
- // token.
- $lineStart= $phpcsFile->findNext(
- array(T_WHITESPACE),
- ($lineStart + 1),
- null,
- true
- );
-
- $startColumn = $tokens[$lineStart]['column'];
-
- // Check that the closing brace is on it's own line.
- $lastContent = $phpcsFile->findPrevious(
- array(T_WHITESPACE),
- ($scopeEnd - 1),
- $scopeStart,
- true
- );
-
- if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
- $error = 'Closing brace must be on a line by itself';
- $phpcsFile->addError($error, $scopeEnd, 'Line');
- return;
- }
-
- // Check now that the closing brace is lined up correctly.
- $braceIndent = $tokens[$scopeEnd]['column'];
- $isBreakCloser = ($tokens[$scopeEnd]['code'] === T_BREAK);
- if (in_array($tokens[$stackPtr]['code'], array(T_CASE, T_DEFAULT)) === true
- && $isBreakCloser === true
- ) {
- // BREAK statements should be indented 4 spaces from the
- // CASE or DEFAULT statement.
- if ($braceIndent !== ($startColumn + 4)) {
-// TODO AJE Allow for tab indents instead of spaces
-// $error = 'Break statement indented incorrectly; expected %s spaces, found %s';
-// $data = array(
-// ($startColumn + 3),
-// ($braceIndent - 1),
-// );
-// $phpcsFile->addError($error, $scopeEnd, 'BreakIdent', $data);
- }
- } else {
- if ($braceIndent !== $startColumn) {
- $error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
- $data = array(
- ($startColumn - 1),
- ($braceIndent - 1),
- );
- $phpcsFile->addError($error, $scopeEnd, 'Indent', $data);
- }
- }
-
- }//end process()
-
-
-}//end class
-
-?>
@@ -2,15 +2,12 @@
<ruleset name="Joomla">
<description>The Joomla coding standard.</description>
- <!-- Exclude all javascript files. There are bugs and we don't have any rules anyways. -->
- <exclude-pattern>*.js</exclude-pattern>
-
<!-- Exclude 3rd party libraries. -->
- <exclude-pattern>*/phputf8/*</exclude-pattern>
- <exclude-pattern>*/simplepie/*</exclude-pattern>
- <exclude-pattern>*/phpmailer/phpmailer.php</exclude-pattern>
- <exclude-pattern>*/phpmailer/smtp.php</exclude-pattern>
- <exclude-pattern>*/phpmailer/pop3.php</exclude-pattern>
+ <exclude-pattern>phputf8/*</exclude-pattern>
+ <exclude-pattern>simplepie/*</exclude-pattern>
+ <exclude-pattern>phpmailer/phpmailer.php</exclude-pattern>
+ <exclude-pattern>phpmailer/smtp.php</exclude-pattern>
+ <exclude-pattern>phpmailer/pop3.php</exclude-pattern>
<exclude-pattern>*/mootree*.css</exclude-pattern>
<exclude-pattern>*/mooRainbow.css</exclude-pattern>
<exclude-pattern>*/modal.css</exclude-pattern>
@@ -52,6 +49,8 @@
<rule ref="Squiz.Scope.StaticThisUsage"/>
+ <rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
+
<!-- Lines can be 85 chars long, but never show errors -->
<rule ref="Generic.Files.LineLength">
<properties>
View
@@ -0,0 +1,11 @@
+{
+ "name": "joomla/joomla-platform",
+ "type": "library",
+ "description": "The Joomla Platform is a platform for writing Web and command line applications in PHP.",
+ "keywords": ["joomla","platform"],
+ "homepage": "https://github.com/joomla/joomla-platform",
+ "license": "GNU Public License",
+ "require": {
+ "php": ">=5.3.1"
+ }
+}
@@ -10,11 +10,9 @@
<section>
<title>Construction</title>
- <para>The contructor for <classname>JViewBase</classname> takes a <classname>JModel</classname> object and a
- <classname>JController</classname> object. Both are mandatory.</para>
+ <para>The contructor for <classname>JViewBase</classname> takes a mandatory <classname>JModel</classname> parameter.</para>
- <para>Note that these are interfaces so the objects do no necessarily have to extend from <classname>JModelBase</classname> or
- <classname>JControllerBase</classname> classes. Given that, the view should only rely on the API that is exposed by the
+ <para>Note that JModel is an interface so the actual object passed does necessarily have to extend from <classname>JModelBase</classname> class. Given that, the view should only rely on the API that is exposed by the
interface and not concrete classes unless the contructor is changed in a derived class to take more explicit classes or
interaces as required by the developer.</para>
</section>
@@ -62,7 +60,7 @@ class MyView extends JViewBase
try
{
- $view = new MyView(new MyDatabaseModel, new MyController);
+ $view = new MyView(new MyDatabaseModel);
echo $view-&gt;render();
}
catch (RuntimeException $e)
@@ -11,7 +11,7 @@
<title>Construction</title>
<para><classname>JViewHtml</classname> is extended from <classname>JViewBase</classname>. The constructor, in addition to the
- model and controller arguments, take an optional <classname>SplPriorityQueue</classname> object that serves as a lookup for
+ required model argument, take an optional <classname>SplPriorityQueue</classname> object that serves as a lookup for
layouts. If omitted, the view defers to the protected <methodname>loadPaths</methodname> method.</para>
</section>
@@ -69,7 +69,7 @@ try
$paths = new SplPriorityQueue;
$paths-&gt;insert(__DIR__ . '/layouts');
- $view = new MyView(new MyDatabaseModel, new MyController, $paths);
+ $view = new MyView(new MyDatabaseModel, $paths);
$view-&gt;setLayout('count');
echo $view-&gt;render();
@@ -1,36 +0,0 @@
-<?php
-class JConfigExample
-{
- public $dbtype = 'mysql';
- public $host = 'localhost';
- public $user = '';
- public $password = '';
- public $db = '';
- public $dbprefix = 'jos_';
- public $ftp_host = '127.0.0.1';
- public $ftp_port = '21';
- public $ftp_user = '';
- public $ftp_pass = '';
- public $ftp_root = '';
- public $ftp_enable = 0;
- public $tmp_path = '/tmp';
- public $log_path = '/var/logs';
- public $mailer = 'mail';
- public $mailfrom = 'admin@localhost.home';
- public $fromname = '';
- public $sendmail = '/usr/sbin/sendmail';
- public $smtpauth = '0';
- public $smtpsecure = 'none';
- public $smtpport = '25';
- public $smtpuser = '';
- public $smtppass = '';
- public $smtphost = 'localhost';
- public $debug = 0;
- public $caching = '0';
- public $cachetime = '900';
- public $language = 'en-GB';
- public $secret = null;
- public $editor = 'none';
- public $offset = 0;
- public $lifetime = 15;
-}
Oops, something went wrong.

0 comments on commit 10e6818

Please sign in to comment.