Merge pull request #16 from samwilson/update-deps

Update coding standards etc.

Author: samwilson

.phpcs.xml

@@ -1,28 +1,14 @@
 <?xml version="1.0"?>
-<ruleset name="PHPCS">
+<ruleset name="PhpFlickr">
     <file>.</file>
     <exclude-pattern>vendor/</exclude-pattern>
-    <!-- Slevomat standards; see https://github.com/slevomat/coding-standard -->
-    <config name="installed_paths" value="../../slevomat/coding-standard" /><!-- relative path from PHPCS source location -->
-    <rule ref="SlevomatCodingStandard">
-        <exclude name="SlevomatCodingStandard.Namespaces.UseOnlyWhitelistedNamespaces" />
-        <exclude name="SlevomatCodingStandard.Files.TypeNameMatchesFileName" />
-        <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation" />
-        <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions" />
-        <exclude name="SlevomatCodingStandard.ControlStructures.NewWithoutParentheses" />
-        <exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing" />
-        <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalFunctions" />
-        <exclude name="SlevomatCodingStandard.Commenting.DisallowOneLinePropertyDocComment" />
-        <exclude name="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison.DisallowedYodaComparison" />
-        <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalConstants" />
-        <exclude name="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators" />
-        <exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.UselessDocComment" />
-    </rule>
-    <arg name="tab-width" value="4" />
-    <rule ref="Generic.WhiteSpace.ScopeIndent">
-        <properties>
-            <property name="tabIndent" value="true" />
-        </properties>
+    <rule ref="OpsWayStrictPSR12CodingStandard">
+        <exclude name="WebimpressCodingStandard.NamingConventions.AbstractClass.Prefix" />
+        <exclude name="WebimpressCodingStandard.PHP.ImportInternalFunction.Import" />
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing.IncorrectWhitespaceBeforeColon" />
+        <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSame" />
+        <exclude name="WebimpressCodingStandard.Arrays.DoubleArrow.SpacesBefore" />
+        <exclude name="Generic.Formatting.SpaceAfterNot.Incorrect" />
+        <exclude name="WebimpressCodingStandard.PHP.ImportInternalConstant.Import" />
     </rule>
 </ruleset>

.travis.yml

@@ -2,6 +2,7 @@ language: php
 
 php:
   - '7.2'
+  - '7.3'
 
 install:
   - composer install

README.md

@@ -7,8 +7,10 @@ This is a command-line interface (CLI) to Flickr, written in PHP.
 
 Features:
 
-* Internationalization.
+* Upload photos.
+* Download photos by album or user.
 * Add checksum machine tags (MD5 or SHA1).
+* Internationalization.
 
 ## Installation
 

composer.json

@@ -15,17 +15,17 @@
         }
     },
     "require": {
-        "krinkle/intuition": "^1.2",
+        "krinkle/intuition": "^2.1",
         "samwilson/phpflickr": "^4.7",
         "symfony/console": "^4.2|^5.0",
         "symfony/yaml": "^4.2|^5.0",
         "symfony/filesystem": "^4.2|^5.0",
-        "twig/twig": "^2.6"
+        "twig/twig": "^3.0"
     },
     "require-dev": {
-        "mediawiki/minus-x": "^0.3",
-        "phpunit/phpunit": "^6.5",
-        "slevomat/coding-standard": "^4.8",
-        "symfony/var-dumper": "^5.0"
+        "mediawiki/minus-x": "^1.0",
+        "phpunit/phpunit": "^7.0|^8.0",
+        "symfony/var-dumper": "^5.0",
+        "opsway/psr12-strict-coding-standard": "^0.3.0"
     }
 }