Skip to content

Commit 85742bc

Browse files
zachborboazachborboa
committed
Merge pull request php-curl-class#233 from zachborboa/master
Add check to prohibit excessively long lines in php files
2 parents 19d161c + bcad567 commit 85742bc

File tree

2 files changed

+31
-12
lines changed

2 files changed

+31
-12
lines changed

‎tests/PHPCurlClass/PHPMultiCurlClassTest.php

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public function testMultiCurlCallback()
5151
$multi_curl = new MultiCurl();
5252
$multi_curl->beforeSend(function ($instance) use (
5353
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
54-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
54+
&$download_before_send_called, &$download_success_called, &$download_error_called,
55+
&$download_complete_called,
5556
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
5657
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
5758
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -118,7 +119,8 @@ public function testMultiCurlCallback()
118119
});
119120
$multi_curl->success(function ($instance) use (
120121
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
121-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
122+
&$download_before_send_called, &$download_success_called, &$download_error_called,
123+
&$download_complete_called,
122124
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
123125
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
124126
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -203,7 +205,8 @@ public function testMultiCurlCallback()
203205
});
204206
$multi_curl->complete(function ($instance) use (
205207
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
206-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
208+
&$download_before_send_called, &$download_success_called, &$download_error_called,
209+
&$download_complete_called,
207210
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
208211
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
209212
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -367,7 +370,8 @@ public function testMultiCurlCallbackError()
367370
$multi_curl = new MultiCurl();
368371
$multi_curl->beforeSend(function ($instance) use (
369372
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
370-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
373+
&$download_before_send_called, &$download_success_called, &$download_error_called,
374+
&$download_complete_called,
371375
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
372376
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
373377
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -451,7 +455,8 @@ public function testMultiCurlCallbackError()
451455
});
452456
$multi_curl->error(function ($instance) use (
453457
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
454-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
458+
&$download_before_send_called, &$download_success_called, &$download_error_called,
459+
&$download_complete_called,
455460
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
456461
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
457462
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -518,7 +523,8 @@ public function testMultiCurlCallbackError()
518523
});
519524
$multi_curl->complete(function ($instance) use (
520525
&$delete_before_send_called, &$delete_success_called, &$delete_error_called, &$delete_complete_called,
521-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called,
526+
&$download_before_send_called, &$download_success_called, &$download_error_called,
527+
&$download_complete_called,
522528
&$get_before_send_called, &$get_success_called, &$get_error_called, &$get_complete_called,
523529
&$head_before_send_called, &$head_success_called, &$head_error_called, &$head_complete_called,
524530
&$options_before_send_called, &$options_success_called, &$options_error_called, &$options_complete_called,
@@ -690,7 +696,8 @@ public function testCurlCallback()
690696
$download_file_path = tempnam('/tmp', 'php-curl-class.');
691697
$download = $multi_curl->addDownload(Test::TEST_URL, $download_file_path);
692698
$download->beforeSend(function ($instance) use (
693-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
699+
&$download_before_send_called, &$download_success_called, &$download_error_called,
700+
&$download_complete_called) {
694701
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
695702
PHPUnit_Framework_Assert::assertFalse($download_before_send_called);
696703
PHPUnit_Framework_Assert::assertFalse($download_success_called);
@@ -699,7 +706,8 @@ public function testCurlCallback()
699706
$download_before_send_called = true;
700707
});
701708
$download->success(function ($instance) use (
702-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
709+
&$download_before_send_called, &$download_success_called, &$download_error_called,
710+
&$download_complete_called) {
703711
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
704712
PHPUnit_Framework_Assert::assertTrue($download_before_send_called);
705713
PHPUnit_Framework_Assert::assertFalse($download_success_called);
@@ -712,7 +720,8 @@ public function testCurlCallback()
712720
$download_error_called = true;
713721
});
714722
$download->complete(function ($instance) use (
715-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
723+
&$download_before_send_called, &$download_success_called, &$download_error_called,
724+
&$download_complete_called) {
716725
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
717726
PHPUnit_Framework_Assert::assertTrue($download_before_send_called);
718727
PHPUnit_Framework_Assert::assertTrue($download_success_called);
@@ -1035,7 +1044,8 @@ public function testCurlCallbackError()
10351044
$download_file_path = tempnam('/tmp', 'php-curl-class.');
10361045
$download = $multi_curl->addDownload(Test::ERROR_URL, $download_file_path);
10371046
$download->beforeSend(function ($instance) use (
1038-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
1047+
&$download_before_send_called, &$download_success_called, &$download_error_called,
1048+
&$download_complete_called) {
10391049
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
10401050
PHPUnit_Framework_Assert::assertFalse($download_before_send_called);
10411051
PHPUnit_Framework_Assert::assertFalse($download_success_called);
@@ -1048,7 +1058,8 @@ public function testCurlCallbackError()
10481058
$download_success_called = true;
10491059
});
10501060
$download->error(function ($instance) use (
1051-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
1061+
&$download_before_send_called, &$download_success_called, &$download_error_called,
1062+
&$download_complete_called) {
10521063
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
10531064
PHPUnit_Framework_Assert::assertTrue($download_before_send_called);
10541065
PHPUnit_Framework_Assert::assertFalse($download_success_called);
@@ -1057,7 +1068,8 @@ public function testCurlCallbackError()
10571068
$download_error_called = true;
10581069
});
10591070
$download->complete(function ($instance) use (
1060-
&$download_before_send_called, &$download_success_called, &$download_error_called, &$download_complete_called) {
1071+
&$download_before_send_called, &$download_success_called, &$download_error_called,
1072+
&$download_complete_called) {
10611073
PHPUnit_Framework_Assert::assertInstanceOf('Curl\Curl', $instance);
10621074
PHPUnit_Framework_Assert::assertTrue($download_before_send_called);
10631075
PHPUnit_Framework_Assert::assertFalse($download_success_called);

‎tests/script.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,10 @@ if [[ ! -z "${trailing_whitespace}" ]]; then
6363
echo -e "${trailing_whitespace}" | perl -pe 's/^(.*)$/Trailing whitespace found in \1/'
6464
exit 1
6565
fi
66+
67+
# Prohibit long lines in php files.
68+
long_lines=$(find . -type "f" -iname "*.php" -exec awk '{print FILENAME":"NR" "length}' {} \; | awk '$2 > 120')
69+
if [[ ! -z "${long_lines}" ]]; then
70+
echo -e "${long_lines}" | perl -pe 's/^(.*)$/Long lines found in \1/'
71+
exit 1
72+
fi

0 commit comments

Comments
 (0)