Use PHPCS 2.x

Author: mbabker

.gitmodules

@@ -36,4 +36,4 @@ before_script:
 
 script:
   - vendor/bin/phpunit
-  - if [ "$RUN_PHPCS" == "yes" ]; then vendor/bin/phpcs -p --report=full --extensions=php --standard=.travis/phpcs/Joomla/ruleset.xml src/; fi;
+  - if [ "$RUN_PHPCS" == "yes" ]; then vendor/bin/phpcs --config-set installed_paths vendor/joomla/coding-standards && vendor/bin/phpcs -p --report=full --extensions=php --standard=ruleset.xml src/; fi;

.travis.yml

@@ -12,8 +12,8 @@
         "joomla/uri": "~1.0|~2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
-        "squizlabs/php_codesniffer": "1.*"
+        "joomla/coding-standards": "~2.0@alpha",
+        "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
     },
     "autoload": {
         "psr-4": {

.travis/phpcs/Joomla

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<ruleset name="Joomla">
+
+    <arg name="report" value="full"/>
+    <arg name="tab-width" value="4"/>
+    <arg name="encoding" value="utf-8"/>
+    <arg value="sp"/>
+    <arg name="colors" />
+
+    <!-- Exclude folders not containing production code -->
+    <exclude-pattern>*/.github/*</exclude-pattern>
+    <exclude-pattern>*/.travis/*</exclude-pattern>
+
+    <!-- Exclude 3rd party libraries. -->
+    <exclude-pattern>*/vendor/*</exclude-pattern>
+
+    <rule ref="Joomla">
+        <exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
+        <!-- Required due to converting to variable names matching GitHub API spec which are named in snake case -->
+        <exclude name="Joomla.NamingConventions.ValidVariableName"/>
+    </rule>
+
+    <rule ref="Joomla.Classes.InstantiateNewClasses">
+        <properties>
+            <property name="shortArraySyntax" value="true"/>
+        </properties>
+    </rule>
+</ruleset>

composer.json

@@ -264,25 +264,24 @@ public function getRateLimit()
 	/**
 	 * 1. Request authorization on GitHub.
 	 *
-	 * @param   string  $client_id     The client ID you received from GitHub when you registered.
-	 * @param   string  $redirect_uri  URL in your app where users will be sent after authorization.
-	 * @param   string  $scope         Comma separated list of scopes.
-	 * @param   string  $state         An unguessable random string. It is used to protect against
-	 *                                 cross-site request forgery attacks.
+	 * @param   string  $clientId     The client ID you received from GitHub when you registered.
+	 * @param   string  $redirectUri  URL in your app where users will be sent after authorization.
+	 * @param   string  $scope        Comma separated list of scopes.
+	 * @param   string  $state        An unguessable random string. It is used to protect against cross-site request forgery attacks.
 	 *
 	 * @return  string
 	 *
 	 * @since   1.0
 	 */
-	public function getAuthorizationLink($client_id, $redirect_uri = '', $scope = '', $state = '')
+	public function getAuthorizationLink($clientId, $redirectUri = '', $scope = '', $state = '')
 	{
 		$uri = new Uri('https://github.com/login/oauth/authorize');
 
-		$uri->setVar('client_id', $client_id);
+		$uri->setVar('client_id', $clientId);
 
-		if ($redirect_uri)
+		if ($redirectUri)
 		{
-			$uri->setVar('redirect_uri', urlencode($redirect_uri));
+			$uri->setVar('redirect_uri', urlencode($redirectUri));
 		}
 
 		if ($scope)
@@ -301,30 +300,30 @@ public function getAuthorizationLink($client_id, $redirect_uri = '', $scope = ''
 	/**
 	 * 2. Request the access token.
 	 *
-	 * @param   string  $client_id      The client ID you received from GitHub when you registered.
-	 * @param   string  $client_secret  The client secret you received from GitHub when you registered.
-	 * @param   string  $code           The code you received as a response to Step 1.
-	 * @param   string  $redirect_uri   URL in your app where users will be sent after authorization.
-	 * @param   string  $format         The response format (json, xml, ).
+	 * @param   string  $clientId      The client ID you received from GitHub when you registered.
+	 * @param   string  $clientSecret  The client secret you received from GitHub when you registered.
+	 * @param   string  $code          The code you received as a response to Step 1.
+	 * @param   string  $redirectUri   URL in your app where users will be sent after authorization.
+	 * @param   string  $format        The response format (json, xml, ).
 	 *
 	 * @return  string
 	 *
 	 * @since   1.0
 	 * @throws  \UnexpectedValueException
 	 */
-	public function requestToken($client_id, $client_secret, $code, $redirect_uri = '', $format = '')
+	public function requestToken($clientId, $clientSecret, $code, $redirectUri = '', $format = '')
 	{
 		$uri = 'https://github.com/login/oauth/access_token';
 
 		$data = array(
-			'client_id'     => $client_id,
-			'client_secret' => $client_secret,
+			'client_id'     => $clientId,
+			'client_secret' => $clientSecret,
 			'code'          => $code
 		);
 
-		if ($redirect_uri)
+		if ($redirectUri)
 		{
-			$data['redirect_uri'] = $redirect_uri;
+			$data['redirect_uri'] = $redirectUri;
 		}
 
 		$headers = array();

ruleset.xml

@@ -50,35 +50,34 @@ public function get($owner, $repo, $sha)
 	 * and then create the refs/tags/[tag] reference. If you want to create a lightweight tag,
 	 * you simply have to create the reference - this call would be unnecessary.
 	 *
-	 * @param   string  $owner         The name of the owner of the GitHub repository.
-	 * @param   string  $repo          The name of the GitHub repository.
-	 * @param   string  $tag           The tag string.
-	 * @param   string  $message       The tag message.
-	 * @param   string  $object        The SHA of the git object this is tagging.
-	 * @param   string  $type          The type of the object we’re tagging. Normally this is a commit
-	 *                                 but it can also be a tree or a blob.
-	 * @param   string  $tagger_name   The name of the author of the tag.
-	 * @param   string  $tagger_email  The email of the author of the tag.
-	 * @param   string  $tagger_date   Timestamp of when this object was tagged.
+	 * @param   string  $owner        The name of the owner of the GitHub repository.
+	 * @param   string  $repo         The name of the GitHub repository.
+	 * @param   string  $tag          The tag string.
+	 * @param   string  $message      The tag message.
+	 * @param   string  $object       The SHA of the git object this is tagging.
+	 * @param   string  $type         The type of the object we’re tagging. Normally this is a commit but it can also be a tree or a blob.
+	 * @param   string  $taggerName   The name of the author of the tag.
+	 * @param   string  $taggerEmail  The email of the author of the tag.
+	 * @param   string  $taggerDate   Timestamp of when this object was tagged.
 	 *
-	 * @since   1.0
+	 * @return  object
 	 *
-	 * @return object
+	 * @since   1.0
 	 */
-	public function create($owner, $repo, $tag, $message, $object, $type, $tagger_name, $tagger_email, $tagger_date)
+	public function create($owner, $repo, $tag, $message, $object, $type, $taggerName, $taggerEmail, $taggerDate)
 	{
 		// Build the request path.
 		$path = '/repos/' . $owner . '/' . $repo . '/git/tags';
 
 		$data = array(
-			'tag'          => $tag,
-			'message'      => $message,
-			'object'       => $object,
-			'type'         => $type,
+			'tag'     => $tag,
+			'message' => $message,
+			'object'  => $object,
+			'type'    => $type,
 			'tagger'  => array(
-				'name' => $tagger_name,
-				'email' => $tagger_email,
-				'date'  => $tagger_date
+				'name'  => $taggerName,
+				'email' => $taggerEmail,
+				'date'  => $taggerDate
 			)
 		);
 

src/Package/Authorization.php

@@ -68,7 +68,7 @@ public function getRecursively($owner, $repo, $sha)
 	 * modifying that tree are specified, it will overwrite the contents of that tree with the
 	 * new path contents and write a new tree out.
 	 *
-	 * Parameters fir the tree:
+	 * Parameters for the tree:
 	 *
 	 * tree.path
 	 *     String of the file referenced in the tree
@@ -84,17 +84,16 @@ public function getRecursively($owner, $repo, $sha)
 	 *     String of content you want this file to have - GitHub will write this blob out and use
 	 *     that SHA for this entry. Use either this or tree.sha
 	 *
-	 * @param   string  $owner      The name of the owner of the GitHub repository.
-	 * @param   string  $repo       The name of the GitHub repository.
-	 * @param   array   $tree       Array of Hash objects (of path, mode, type and sha) specifying
-	 *                              a tree structure
-	 * @param   string  $base_tree  The SHA1 of the tree you want to update with new data.
+	 * @param   string  $owner     The name of the owner of the GitHub repository.
+	 * @param   string  $repo      The name of the GitHub repository.
+	 * @param   array   $tree      Array of Hash objects (of path, mode, type and sha) specifying a tree structure
+	 * @param   string  $baseTree  The SHA1 of the tree you want to update with new data.
 	 *
-	 * @since   1.0
+	 * @return  object
 	 *
-	 * @return object
+	 * @since   1.0
 	 */
-	public function create($owner, $repo, $tree, $base_tree = '')
+	public function create($owner, $repo, $tree, $baseTree = '')
 	{
 		// Build the request path.
 		$path = '/repos/' . $owner . '/' . $repo . '/git/trees';
@@ -103,9 +102,9 @@ public function create($owner, $repo, $tree, $base_tree = '')
 
 		$data['tree'] = $tree;
 
-		if ($base_tree)
+		if ($baseTree)
 		{
-			$data['base_tree'] = $base_tree;
+			$data['base_tree'] = $baseTree;
 		}
 
 		return $this->processResponse(

src/Package/Data/Tags.php

@@ -43,7 +43,9 @@ class Issues extends AbstractPackage
 	 * @since   1.0
 	 * @throws  \DomainException
 	 */
-	public function create($user, $repo, $title, $body = null, $assignee = null, $milestone = null, array $labels = array(), array $assignees = array())
+	public function create($user, $repo, $title, $body = null, $assignee = null, $milestone = null, array $labels = array(),
+		array $assignees = array()
+	)
 	{
 		// Build the request path.
 		$path = '/repos/' . $user . '/' . $repo . '/issues';
@@ -101,7 +103,9 @@ public function create($user, $repo, $title, $body = null, $assignee = null, $mi
 	 * @since   1.0
 	 * @throws  \DomainException
 	 */
-	public function edit($user, $repo, $issueId, $state = null, $title = null, $body = null, $assignee = null, $milestone = null, array $labels = null)
+	public function edit($user, $repo, $issueId, $state = null, $title = null, $body = null, $assignee = null, $milestone = null,
+		array $labels = null
+	)
 	{
 		// Build the request path.
 		$path = '/repos/' . $user . '/' . $repo . '/issues/' . (int) $issueId;
@@ -197,7 +201,8 @@ public function get($user, $repo, $issueId)
 	 * @throws  \DomainException
 	 */
 	public function getList($filter = null, $state = null, $labels = null, $sort = null,
-		$direction = null, \DateTime $since = null, $page = 0, $limit = 0)
+		$direction = null, \DateTime $since = null, $page = 0, $limit = 0
+	)
 	{
 		// Build the request path.
 		$path = '/issues';
@@ -260,7 +265,8 @@ public function getList($filter = null, $state = null, $labels = null, $sort = n
 	 * @throws  \DomainException
 	 */
 	public function getListByRepository($user, $repo, $milestone = null, $state = null, $assignee = null, $mentioned = null, $labels = null,
-		$sort = null, $direction = null, \DateTime $since = null, $page = 0, $limit = 0)
+		$sort = null, $direction = null, \DateTime $since = null, $page = 0, $limit = 0
+	)
 	{
 		// Build the request path.
 		$path = '/repos/' . $user . '/' . $repo . '/issues';

src/Package/Data/Trees.php

@@ -26,18 +26,18 @@ class Events extends AbstractPackage
 	/**
 	 * List events for an issue.
 	 *
-	 * @param   string   $owner         The name of the owner of the GitHub repository.
-	 * @param   string   $repo          The name of the GitHub repository.
-	 * @param   integer  $issue_number  The issue number.
-	 * @param   integer  $page          The page number from which to get items.
-	 * @param   integer  $limit         The number of items on a page.
+	 * @param   string   $owner        The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $issueNumber  The issue number.
+	 * @param   integer  $page         The page number from which to get items.
+	 * @param   integer  $limit        The number of items on a page.
 	 *
 	 * @return object
 	 */
-	public function getList($owner, $repo, $issue_number, $page = 0, $limit = 0)
+	public function getList($owner, $repo, $issueNumber, $page = 0, $limit = 0)
 	{
 		// Build the request path.
-		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . (int) $issue_number . '/events';
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . (int) $issueNumber . '/events';
 
 		// Send the request.
 		return $this->processResponse(