Skip to content

Commit c60ccf0

Browse files
committed
PHPCodeSniffer config updated, code formatting fixed, PHPUnit fails related to test classes fixed (#103)
1 parent 6ca712f commit c60ccf0

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

phpcs.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<arg value="np"/>
1414

1515
<rule ref="PSR1"/>
16-
<rule ref="PSR2"/>
16+
<rule ref="PSR12"/>
1717
</ruleset>

src/file/File.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ private static function validatePathToWrite($path)
142142
{
143143
$directoryPath = dirname($path);
144144

145-
if ((file_exists($path) && !is_writable($path))
146-
|| (!file_exists($path) && !is_writable($directoryPath))) {
145+
if (
146+
(file_exists($path) && !is_writable($path))
147+
|| (!file_exists($path) && !is_writable($directoryPath))
148+
) {
147149
throw new FileException(
148150
'File '
149151
. $path

tests/unit_tests/coder_builder/CoderBuildingTraitTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function testBuildCoder($traitUsingClassObject, $expectedCoderClass)
125125
*
126126
* @return array
127127
*/
128-
public function traitUsingClassObjectsWithImproperPostfixProvider()
128+
public static function traitUsingClassObjectsWithImproperPostfixProvider()
129129
{
130130
return array(
131131
array(new DummyClassFormat1Nocoder()),
@@ -141,7 +141,7 @@ public function traitUsingClassObjectsWithImproperPostfixProvider()
141141
*
142142
* @return array
143143
*/
144-
public function traitUsingClassObjectsWithImproperPrefixProvider()
144+
public static function traitUsingClassObjectsWithImproperPrefixProvider()
145145
{
146146
return array(
147147
array(new FormatnotrecognizedDummyClassEncoder()),
@@ -155,7 +155,7 @@ public function traitUsingClassObjectsWithImproperPrefixProvider()
155155
*
156156
* @return array
157157
*/
158-
public function traitUsingClassObjectsWithImproperDataFormatProvider()
158+
public static function traitUsingClassObjectsWithImproperDataFormatProvider()
159159
{
160160
return array(
161161
array(new DummyClassFormatNullEncoder()),
@@ -173,7 +173,7 @@ public function traitUsingClassObjectsWithImproperDataFormatProvider()
173173
*
174174
* @return array
175175
*/
176-
public function traitUsingClassObjectsAndBuiltCoderClassesProvider()
176+
public static function traitUsingClassObjectsAndBuiltCoderClassesProvider()
177177
{
178178
return array(
179179
array(new DummyClassFormat1Encoder(), self::DUMMY_CODERS_NAMESPACE . '\Format1DataEncoder'),

tests/unit_tests/coders/data_coders/data_decoders/DataDecoderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function testDecodeData($data)
151151
*
152152
* @return array
153153
*/
154-
public function dataFormatsAndResultsProvider()
154+
public static function dataFormatsAndResultsProvider()
155155
{
156156
return array(
157157
array('format1', array('<FORMAT 1 DECODED DATA/>')),
@@ -165,7 +165,7 @@ public function dataFormatsAndResultsProvider()
165165
*
166166
* @return array
167167
*/
168-
public function dataProvider()
168+
public static function dataProvider()
169169
{
170170
return array(
171171
array('apple'),

tests/unit_tests/coders/data_coders/data_encoders/DataEncoderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function testEncodeData($data)
152152
*
153153
* @return array
154154
*/
155-
public function dataFormatsAndResultsProvider()
155+
public static function dataFormatsAndResultsProvider()
156156
{
157157
return array(
158158
array('format1', '<FORMAT 1 ENCODED DATA/>'),
@@ -166,7 +166,7 @@ public function dataFormatsAndResultsProvider()
166166
*
167167
* @return array
168168
*/
169-
public function dataProvider()
169+
public static function dataProvider()
170170
{
171171
return array(
172172
array(array('apple')),

tests/unit_tests/coders/datafile_coders/datafile_decoders/DatafileDecoderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function testDecodeFileWhenDataFormatIsNotSet()
229229
*
230230
* @return array
231231
*/
232-
public function dataFormatsAndResultsProvider()
232+
public static function dataFormatsAndResultsProvider()
233233
{
234234
return array(
235235
array('format1', array('<FORMAT 1 DECODED DATA/>')),

tests/unit_tests/coders/datafile_coders/datafile_encoders/DatafileEncoderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public function testEncodeFileWhenDataFormatIsNotSet()
222222
*
223223
* @return array
224224
*/
225-
public function dataFormatsAndResultsProvider()
225+
public static function dataFormatsAndResultsProvider()
226226
{
227227
return array(
228228
array('format1', '<FORMAT 1 ENCODED DATA/>'),

tests/unit_tests/data_format/DataFormatTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function testDataFormatsItems($formatAbbreviation, $expectedFormatFullNam
5858
*
5959
* @return array
6060
*/
61-
public function formatAbbreviationAndFullNameProvider()
61+
public static function formatAbbreviationAndFullNameProvider()
6262
{
6363
return array(
6464
array('JSON', 'JSON'),

tests/unit_tests/file/FileTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function testSetContent($filePath, $fileContent)
303303
*
304304
* @return array
305305
*/
306-
public function filePathExtensionProvider()
306+
public static function filePathExtensionProvider()
307307
{
308308
return array(
309309
array('file', ''),
@@ -319,7 +319,7 @@ public function filePathExtensionProvider()
319319
*
320320
* @return array
321321
*/
322-
public function fileForReadPathAndContentProvider()
322+
public static function fileForReadPathAndContentProvider()
323323
{
324324
return array(
325325
array(self::buildFileFixturePath('file-for-read'), 'File for read'),
@@ -335,7 +335,7 @@ public function fileForReadPathAndContentProvider()
335335
*
336336
* @return array
337337
*/
338-
public function fileForWritePathAndContentProvider()
338+
public static function fileForWritePathAndContentProvider()
339339
{
340340
return array(
341341
array(self::buildFileFixturePath('file-for-write'), 'File for write'),
@@ -355,7 +355,7 @@ public function fileForWritePathAndContentProvider()
355355
*
356356
* @return array
357357
*/
358-
public function improperFileContentProvider()
358+
public static function improperFileContentProvider()
359359
{
360360
return array(
361361
array(null),

0 commit comments

Comments
 (0)