change codeception for pest

.gitattributes

@@ -17,3 +17,7 @@
 /codeception.yml export-ignore
 /composer.lock export-ignore
 /jpgraph_logo.jpg export-ignore
+/.php_cs.cache export-ignore
+/.phpunit.result.cache export-ignore
+/.build/csfixer.cache export-ignore
+/.build/phplint.cache export-ignore

.github/workflows/coverage.yml

@@ -53,7 +53,7 @@ jobs:
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"
         echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
     - name: Install PHP dependencies
-      run: composer update --'prefer-stable' --no-interaction --no-progress
+      run: composer install   --prefer-dist --no-interaction --no-progress --ignore-platform-reqs
 
     - name: Coverage
       run: composer coverage

.github/workflows/tests.yml

@@ -28,7 +28,7 @@ jobs:
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"
         echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
     - name: Install PHP dependencies
-      run: composer update --'prefer-stable' --no-interaction --no-progress --ignore-platform-reqs
+      run: composer install --no-plugins --prefer-dist --no-interaction --no-progress --ignore-platform-reqs
 
     - name: PHPLint
       run: composer lint    

.php_cs.php

@@ -12,7 +12,7 @@
 $version = $composerinfo->extra->version;
 $header = "JPGraph - Community Edition";
 
-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php73($header), [
+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php74($header), [
 	'declare_strict_types' => false,
 	'void_return' => false,
 	'static_lambda' => false,
@@ -33,7 +33,8 @@
 $project_path = getcwd();
 $config->getFinder()
 	->in([
-		__DIR__
+		__DIR__.'/src',
+		__DIR__.'/tests'
 	])
 	->name('*.php')
 	->exclude([

Examples/assets/dataset01.inc.php

@@ -1,14 +1,14 @@
 <?php
 
 /**
- * JPGraph v4.1.0-beta.01
+ * JPGraph - Community Edition
  */
 
 $ydata = [
     0 => 1.0885908919277, 1 => 0.99034385297982, 2 => 0.97005467188578, 3 => 0.99901201350824, 4 => 1.1263167971152, 5 => 1.0582808133448, 6 => 1.0216740689064, 7 => 0.96626236356644, 8 => 1.0125912828768, 9 => 0.99047473992496, 10 => 0.99102472104561, 11 => 0.98500781573283, 12 => 0.91933668914198, 13 => 0.92234602792711, 14 => 0.88933863410054, 15 => 0.94236150975178, 16 => 0.98924287679116, 17 => 1.0342765545566, 18 => 1.0538510278089, 19 => 0.93496076181191, 20 => 0.90944479677235, 21 => 0.80831866316983, 22 => 0.81912434615535, 23 => 0.83143770042109, 24 => 0.86972168159496, 25 => 0.92645774571577, 26 => 0.81169120061422, 27 => 0.84409853057606, 28 => 0.89065856249272, 29 => 0.83551478929348, 30 => 0.87015680306726, 31 => 0.76063327042172, 32 => 0.82720958380697, 33 => 0.86565279505723, 34 => 0.77858966246836, 35 => 0.81009606378237, 36 => 0.80485136798149, 37 => 0.82641461943804, 38 => 0.87442020676513, 39 => 0.89589150146825, 40 => 0.92082995956816, 41 => 0.92614241931726, 42 => 0.96915564652581, 43 => 1.003753706293, 44 => 0.97438809368023, 45 => 1.011556766867, 46 => 1.0785692014115, 47 => 1.0586915420364, 48 => 1.284210059027, 49 => 1.3424512661794, 50 => 1.1743365450983, 51 => 1.2387345559532, 52 => 1.2485728609648, 53 => 1.2330096418558, 54 => 1.1857882621709, 55 => 1.2344956522411, 56 => 1.2047675730648, 57 => 1.292419000136, 58 => 1.3405480219013, 59 => 1.3971752198648, 60 => 1.4359555309649, 61 => 1.3243735045701, 62 => 1.2359389187087, 63 => 1.2201320423161, 64 => 1.3602246705197, 65 => 1.360886940568, 66 => 1.3493553211075, 67 => 1.4401769929405, 68 => 1.3979767849951, 69 => 1.4545882591647, 70 => 1.337801210539, 71 => 1.3793601365977, 72 => 1.4586769476223, 73 => 1.5230946076475, 74 => 1.4124735946125, 75 => 1.4030318592551, 76 => 1.349158816711, 77 => 1.3994840622105, 78 => 1.4239672612346, 79 => 1.40812256221, 80 => 1.4583856197192, 81 => 1.4613314581567, 82 => 1.6756755916668, 83 => 1.8580313939158, 84 => 1.8342360959805, 85 => 1.9216082598086, 86 => 1.9478846253628, 87 => 2.0244872112436, 88 => 1.9560660777181, 89 => 1.8415152640121, 90 => 1.8471764273372, 91 => 1.8889886695023, 92 => 1.8195007209252, 93 => 1.8960270595999, 94 => 1.8644490575386, 95 => 1.971196340772, 96 => 2.015583152659, 97 => 1.9959882430428, 98 => 2.1063668082622, 99 => 2.1719175769191, 100 => 2.1875938345039, 101 => 2.1587594039981, 102 => 2.1278241823627, 103 => 2.298793912594, 104 => 2.3723774302753, 105 => 2.4413392788904, 106 => 2.4834594954125, 107 => 2.5164271989421, 108 => 2.48274719503, 109 => 2.4492997581034, 110 => 2.1412357263019, 111 => 2.0314268112566, 112 => 1.9596098764628, 113 => 2.0250983127109, 114 => 1.924959829851, 115 => 1.9603612943993, 116 => 2.0540576271866, 117 => 2.0568349960689, 118 => 2.0811524692325, 119 => 2.0581964759165, 120 => 2.020162840272, 121 => 2.0626517638667, 122 => 1.9286563823225, 123 => 2.0127912437563, 124 => 1.9491858277931, 125 => 1.8692310150316, 126 => 1.6993275416762, 127 => 1.5849680675709, 128 => 1.5422481968304, 129 => 1.603188853916, 130 => 1.6449504349551, 131 => 1.6570332084417, 132 => 1.7563884552262, 133 => 1.7346008663135, 134 => 1.741307942998, 135 => 1.7415848536123, 136 => 1.7014366147405, 137 => 1.6719646364256, 138 => 1.7092888030342, 139 => 1.7371529028402, 140 => 1.7019154041991, 141 => 1.7662473702497, 142 => 1.8480766044197, 143 => 1.8355114169662, 144 => 1.7819817315586, 145 => 1.7148079481036, 146 => 1.6241989833489, 147 => 1.4624626548138, 148 => 1.5040542012939, 149 => 1.442295346913, 150 => 1.4187087000604, 151 => 1.4225097958511, 152 => 1.5001324671865, 153 => 1.4584802723727, 154 => 1.5342572961469, 155 => 1.514133174734, 156 => 1.5443934302345, 157 => 1.5476883863698, 158 => 1.6080128685721, 159 => 1.5816649899396, 160 => 1.5310436755918, 161 => 1.518280754595, 162 => 1.5216184249044, 163 => 1.4393414811719, 164 => 1.409379582707, 165 => 1.436861898056, 166 => 1.4739894373751, 167 => 1.4512785421546, 168 => 1.496057581316, 169 => 1.3817455776456, 170 => 1.2990312802211, 171 => 1.3073949130374, 172 => 1.2473214566896, 173 => 1.1105915111374, 174 => 1.0420360580822, 175 => 1.1744654786356, 176 => 1.0602876800127, 177 => 1.074408841208, 178 => 1.18387615056, 179 => 1.1890999077101, 180 => 1.0549293038746, 181 => 1.0570601708416, 182 => 1.0800216692849, 183 => 0.96274117702549, 184 => 0.9501673977047, 185 => 0.97710108451711, 186 => 0.89886322996001, 187 => 0.9239453369566, 188 => 0.96299807255386, 189 => 1.0105532418267, 190 => 1.0164009465948, 191 => 1.0413107606824, 192 => 1.0475248122459, 193 => 1.0266007451985, 194 => 1.0159556206533, 195 => 1.0943852922517, 196 => 1.0750418553654, 197 => 0.97774129938915, 198 => 0.98590717162284, 199 => 0.87713795242119, 200 => 0.90770624057599, 201 => 0.87557547650302, 202 => 0.95754187545856, 203 => 1.0111465867283, 204 => 0.93224663470275, 205 => 0.93886113881632, 206 => 0.94128877256653, 207 => 0.9559086414866, 208 => 0.97782683000598, 209 => 1.0648991708916, 210 => 1.1759619281479, 211 => 1.1323001889786, 212 => 1.2173222321276, 213 => 1.192219780365, 214 => 1.1507367671992, 215 => 1.0062415877475, 216 => 1.0017043563084, 217 => 0.94468309902865, 218 => 0.99384124056529, 219 => 1.0514822705943, 220 => 1.0451723914426, 221 => 1.0776122119814, 222 => 1.2013601009631, 223 => 1.1765086398423, 224 => 1.2387735028784, 225 => 1.2441365026242, 226 => 1.2694500268723, 227 => 1.2789962941485, 228 => 1.2442094256309, 229 => 1.2352688438234, 230 => 1.2571277155372, 231 => 1.3291795377077, 232 => 1.2703480599183, 233 => 1.30729508393, 234 => 1.3233030218068, 235 => 1.2861232143244, 236 => 1.3168684998023, 237 => 1.2499001566772, 238 => 1.2622769692485, 239 => 1.2160789893735, 240 => 1.2288877111321, 241 => 1.222967255453, 242 => 1.2998243638567, 243 => 1.3443008723449, 244 => 1.339680674028, 245 => 1.3779965791538, 246 => 1.3560080691721, 247 => 1.3470544172094, 248 => 1.3166882067851, 249 => 1.4452459865932, 250 => 1.4514278120119, 251 => 1.413690283372, 252 => 1.4178934332405, 253 => 1.4237414657565, 254 => 1.3777636409301, 255 => 1.4041849448389, 256 => 1.4049533546771, 257 => 1.4277375831259, 258 => 1.4224090113077, 259 => 1.4647907974628, 260 => 1.4243190632657, 261 => 1.4286580133998, 262 => 1.4348828641501, 263 => 1.415409243977, 264 => 1.4476028555859, 265 => 1.4538821661641, 266 => 1.4883184435336, 267 => 1.4205032194634, 268 => 1.3856543933372, 269 => 1.2716906168086, 270 => 1.3462117624752, 271 => 1.3003015423298, 272 => 1.2148491725878, 273 => 1.2605381058318, 274 => 1.2690047369619, 275 => 1.3327723638582, 276 => 1.3118643588249, 277 => 1.293007944258, 278 => 1.2548761810876, 279 => 1.3335015938603, 280 => 1.3152744239077, 281 => 1.2564376463182, 282 => 1.2478417859372, 283 => 1.2518821298414, 284 => 1.2036453589032, 285 => 1.1798564480155, 286 => 1.2062515260098, 287 => 1.2129817801455, 288 => 1.1405762096618, 289 => 1.0161049810033, 290 => 1.0030124197677, 291 => 1.0111565082559, 292 => 1.0084286839061, 293 => 0.95068297130577, 294 => 1.0450005357207, 295 => 1.211596899292, 296 => 1.3762615912002, 297 => 1.530127116787, 298 => 1.5167370832585, 299 => 1.6259521507076, 300 => 1.6518467383405, 301 => 1.7713043850286, 302 => 1.6396708687084, 303 => 1.6116177484122, 304 => 1.5225729470695, 305 => 1.6101471149808, ];
 
 $xdata = [
-    0   => 444348000, 1 => 446853600, 2 => 449532000, 3 => 452124000, 4 => 454802400, 5 => 457394400, 6 => 460072800, 7 => 462751200, 8 => 465343200, 9 => 468021600, 10 => 470613600, 11 => 473292000, 12 => 475970400, 13 => 478389600, 14 => 481068000, 15 => 483660000, 16 => 486338400, 17 => 488930400, 18 => 491608800, 19 => 494287200, 20 => 496879200, 21 => 499557600, 22 => 502149600, 23 => 504828000, 24 => 507506400, 25 => 509925600, 26 => 512604000, 27 => 515196000, 28 => 517874400, 29 => 520466400, 30 => 523144800, 31 => 525823200, 32 => 528415200, 33 => 531093600, 34 => 533685600, 35 => 536364000, 36 => 539042400, 37 => 541461600, 38 => 544140000, 39 => 546732000, 40 => 549410400, 41 => 552002400, 42 => 554680800, 43 => 557359200, 44 => 559951200, 45 => 562629600, 46 => 565221600, 47 => 567900000, 48 => 570578400, 49 => 573084000, 50 => 575762400, 51 => 578354400, 52 => 581032800, 53 => 583624800, 54 => 586303200, 55 => 588981600, 56 => 591573600, 57 => 594252000, 58 => 596844000, 59 => 599522400, 60 => 602200800, 61 => 604620000, 62 => 607298400, 63 => 609890400, 64 => 612568800, 65 => 615160800, 66 => 617839200, 67 => 620517600, 68 => 623109600, 69 => 625788000, 70 => 628380000, 71 => 631058400, 72 => 633736800, 73 => 636156000, 74 => 638834400, 75 => 641426400, 76 => 644104800, 77 => 646696800, 78 => 649375200, 79 => 652053600, 80 => 654645600, 81 => 657324000, 82 => 659916000, 83 => 662594400, 84 => 665272800, 85 => 667692000, 86 => 670370400, 87 => 672962400, 88 => 675640800, 89 => 678232800, 90 => 680911200, 91 => 683589600, 92 => 686181600, 93 => 688860000, 94 => 691452000, 95 => 694130400, 96 => 696808800, 97 => 699314400, 98 => 701992800, 99 => 704584800, 100 => 707263200, 101 => 709855200, 102 => 712533600, 103 => 715212000, 104 => 717804000, 105 => 720482400, 106 => 723074400, 107 => 725752800, 108 => 728431200, 109 => 730850400, 110 => 733528800, 111 => 736120800, 112 => 738799200, 113 => 741391200, 114 => 744069600, 115 => 746748000, 116 => 749340000, 117 => 752018400, 118 => 754610400, 119 => 757288800, 120 => 759967200, 121 => 762386400, 122 => 765064800, 123 => 767656800, 124 => 770335200, 125 => 772927200, 126 => 775605600, 127 => 778284000, 128 => 780876000, 129 => 783554400, 130 => 786146400, 131 => 788824800, 132 => 791503200, 133 => 793922400, 134 => 796600800, 135 => 799192800, 136 => 801871200, 137 => 804463200, 138 => 807141600, 139 => 809820000, 140 => 812412000, 141 => 815090400, 142 => 817682400, 143 => 820360800, 144 => 823039200, 145 => 825544800, 146 => 828223200, 147 => 830815200, 148 => 833493600, 149 => 836085600, 150 => 838764000, 151 => 841442400, 152 => 844034400, 153 => 846712800, 154 => 849304800, 155 => 851983200, 156 => 854661600, 157 => 857080800, 158 => 859759200, 159 => 862351200, 160 => 865029600, 161 => 867621600, 162 => 870300000, 163 => 872978400, 164 => 875570400, 165 => 878248800, 166 => 880840800, 167 => 883519200, 168 => 886197600, 169 => 888616800, 170 => 891295200, 171 => 893887200, 172 => 896565600, 173 => 899157600, 174 => 901836000, 175 => 904514400, 176 => 907106400, 177 => 909784800, 178 => 912376800, 179 => 915055200, 180 => 917733600, 181 => 920152800, 182 => 922831200, 183 => 925423200, 184 => 928101600, 185 => 930693600, 186 => 933372000, 187 => 936050400, 188 => 938642400, 189 => 941320800, 190 => 943912800, 191 => 946591200, 192 => 949269600, 193 => 951775200, 194 => 954453600, 195 => 957045600, 196 => 959724000, 197 => 962316000, 198 => 964994400, 199 => 967672800, 200 => 970264800, 201 => 972943200, 202 => 975535200, 203 => 978213600, 204 => 980892000, 205 => 983311200, 206 => 985989600, 207 => 988581600, 208 => 991260000, 209 => 993852000, 210 => 996530400, 211 => 999208800, 212 => 1001800800, 213 => 1004479200, 214 => 1007071200,
+    0 => 444348000, 1 => 446853600, 2 => 449532000, 3 => 452124000, 4 => 454802400, 5 => 457394400, 6 => 460072800, 7 => 462751200, 8 => 465343200, 9 => 468021600, 10 => 470613600, 11 => 473292000, 12 => 475970400, 13 => 478389600, 14 => 481068000, 15 => 483660000, 16 => 486338400, 17 => 488930400, 18 => 491608800, 19 => 494287200, 20 => 496879200, 21 => 499557600, 22 => 502149600, 23 => 504828000, 24 => 507506400, 25 => 509925600, 26 => 512604000, 27 => 515196000, 28 => 517874400, 29 => 520466400, 30 => 523144800, 31 => 525823200, 32 => 528415200, 33 => 531093600, 34 => 533685600, 35 => 536364000, 36 => 539042400, 37 => 541461600, 38 => 544140000, 39 => 546732000, 40 => 549410400, 41 => 552002400, 42 => 554680800, 43 => 557359200, 44 => 559951200, 45 => 562629600, 46 => 565221600, 47 => 567900000, 48 => 570578400, 49 => 573084000, 50 => 575762400, 51 => 578354400, 52 => 581032800, 53 => 583624800, 54 => 586303200, 55 => 588981600, 56 => 591573600, 57 => 594252000, 58 => 596844000, 59 => 599522400, 60 => 602200800, 61 => 604620000, 62 => 607298400, 63 => 609890400, 64 => 612568800, 65 => 615160800, 66 => 617839200, 67 => 620517600, 68 => 623109600, 69 => 625788000, 70 => 628380000, 71 => 631058400, 72 => 633736800, 73 => 636156000, 74 => 638834400, 75 => 641426400, 76 => 644104800, 77 => 646696800, 78 => 649375200, 79 => 652053600, 80 => 654645600, 81 => 657324000, 82 => 659916000, 83 => 662594400, 84 => 665272800, 85 => 667692000, 86 => 670370400, 87 => 672962400, 88 => 675640800, 89 => 678232800, 90 => 680911200, 91 => 683589600, 92 => 686181600, 93 => 688860000, 94 => 691452000, 95 => 694130400, 96 => 696808800, 97 => 699314400, 98 => 701992800, 99 => 704584800, 100 => 707263200, 101 => 709855200, 102 => 712533600, 103 => 715212000, 104 => 717804000, 105 => 720482400, 106 => 723074400, 107 => 725752800, 108 => 728431200, 109 => 730850400, 110 => 733528800, 111 => 736120800, 112 => 738799200, 113 => 741391200, 114 => 744069600, 115 => 746748000, 116 => 749340000, 117 => 752018400, 118 => 754610400, 119 => 757288800, 120 => 759967200, 121 => 762386400, 122 => 765064800, 123 => 767656800, 124 => 770335200, 125 => 772927200, 126 => 775605600, 127 => 778284000, 128 => 780876000, 129 => 783554400, 130 => 786146400, 131 => 788824800, 132 => 791503200, 133 => 793922400, 134 => 796600800, 135 => 799192800, 136 => 801871200, 137 => 804463200, 138 => 807141600, 139 => 809820000, 140 => 812412000, 141 => 815090400, 142 => 817682400, 143 => 820360800, 144 => 823039200, 145 => 825544800, 146 => 828223200, 147 => 830815200, 148 => 833493600, 149 => 836085600, 150 => 838764000, 151 => 841442400, 152 => 844034400, 153 => 846712800, 154 => 849304800, 155 => 851983200, 156 => 854661600, 157 => 857080800, 158 => 859759200, 159 => 862351200, 160 => 865029600, 161 => 867621600, 162 => 870300000, 163 => 872978400, 164 => 875570400, 165 => 878248800, 166 => 880840800, 167 => 883519200, 168 => 886197600, 169 => 888616800, 170 => 891295200, 171 => 893887200, 172 => 896565600, 173 => 899157600, 174 => 901836000, 175 => 904514400, 176 => 907106400, 177 => 909784800, 178 => 912376800, 179 => 915055200, 180 => 917733600, 181 => 920152800, 182 => 922831200, 183 => 925423200, 184 => 928101600, 185 => 930693600, 186 => 933372000, 187 => 936050400, 188 => 938642400, 189 => 941320800, 190 => 943912800, 191 => 946591200, 192 => 949269600, 193 => 951775200, 194 => 954453600, 195 => 957045600, 196 => 959724000, 197 => 962316000, 198 => 964994400, 199 => 967672800, 200 => 970264800, 201 => 972943200, 202 => 975535200, 203 => 978213600, 204 => 980892000, 205 => 983311200, 206 => 985989600, 207 => 988581600, 208 => 991260000, 209 => 993852000, 210 => 996530400, 211 => 999208800, 212 => 1001800800, 213 => 1004479200, 214 => 1007071200,
     215 => 1009749600, 216 => 1012428000, 217 => 1014847200, 218 => 1017525600, 219 => 1020117600,
     220 => 1022796000, 221 => 1025388000, 222 => 1028066400, 223 => 1030744800, 224 => 1033336800,
     225 => 1036015200, 226 => 1038607200, 227 => 1041285600, 228 => 1043964000, 229 => 1046383200,
@@ -28,4 +28,4 @@
     295 => 1220133600, 296 => 1222725600, 297 => 1225404000, 298 => 1227996000, 299 => 1230674400,
     300 => 1233352800, 301 => 1235772000, 302 => 1238450400, 303 => 1241042400, 304 => 1243720800,
     305 => 1246312800,
-    ];
+];

Examples/example_list.php

@@ -1,39 +1,43 @@
 <?php
 
 /**
- * JPGraph v4.1.0-beta.01
+ * JPGraph - Community Edition
  */
 
 /**
  * JPGraph v4.1.0-beta.01.
  */
 function GetFiles()
 {
-    $d = dir(__DIR__);
+    $d = \dir(__DIR__);
     $a = [];
+
     while ($entry = $d->Read()) {
-        if (is_dir($entry) && ($entry != 'assets') && $entry !== '.' && $entry !== '..') {
-            $examplefolder = dir($entry);
+        if (\is_dir($entry) && ('assets' !== $entry) && '.' !== $entry && '..' !== $entry) {
+            $examplefolder = \dir($entry);
+
             while ($file = $examplefolder->Read()) {
-                if (is_dir($file) || !strstr($file, '.php')) {
+                if (\is_dir($file) || !\mb_strstr($file, '.php')) {
                     continue;
                 }
-                if (!strstr($entry, 'csim') && strstr($file, 'x') && !strstr($file, 'show') && !strstr($file, 'csim')) {
+
+                if (!\mb_strstr($entry, 'csim') && \mb_strstr($file, 'x') && !\mb_strstr($file, 'show') && !\mb_strstr($file, 'csim')) {
                     $a[] = $entry . '/' . $file;
-                } elseif (strstr($entry, 'csim') && !strstr($entry, 'graph')) {
+                } elseif (\mb_strstr($entry, 'csim') && !\mb_strstr($entry, 'graph')) {
                     $a[] = $entry . '/' . $file;
                 }
             }
         }
     }
     $d->Close();
-    if (count($a) == 0) {
-        die("PANIC: Apache/PHP does not have enough permission to read the scripts in directory: {$this->iDir}");
+
+    if (\count($a) === 0) {
+        exit("PANIC: Apache/PHP does not have enough permission to read the scripts in directory: {$this->iDir}");
     }
-    sort($a);
+    \sort($a);
 
     return $a;
 }
 
 $files = GetFiles();
-echo "window.files='" . json_encode($files) . "';";
+echo "window.files='" . \json_encode($files) . "';";